From 9f74b1ba37ef39a810b6142ff0f2bece1b6babe5 Mon Sep 17 00:00:00 2001 From: Pratik Nayak Date: Mon, 26 Aug 2024 12:59:02 +0200 Subject: [PATCH] fixup! [cuda, hip] remove unnecessary headers --- .../cuda_hip/preconditioner/batch_block_jacobi.hpp | 6 ------ common/cuda_hip/preconditioner/batch_identity.hpp | 4 ---- .../cuda_hip/preconditioner/batch_scalar_jacobi.hpp | 6 ------ common/cuda_hip/solver/batch_bicgstab_kernels.hpp | 1 - cuda/solver/batch_bicgstab_kernels.cu | 13 ------------- cuda/solver/batch_cg_kernels.cu | 4 ---- hip/solver/batch_bicgstab_kernels.hip.cpp | 11 ----------- hip/solver/batch_cg_kernels.hip.cpp | 12 ------------ 8 files changed, 57 deletions(-) diff --git a/common/cuda_hip/preconditioner/batch_block_jacobi.hpp b/common/cuda_hip/preconditioner/batch_block_jacobi.hpp index c01bafa875a..604989dfa6d 100644 --- a/common/cuda_hip/preconditioner/batch_block_jacobi.hpp +++ b/common/cuda_hip/preconditioner/batch_block_jacobi.hpp @@ -11,17 +11,11 @@ #include #include -#include "common/cuda_hip/base/batch_multi_vector_kernels.hpp" #include "common/cuda_hip/base/batch_struct.hpp" #include "common/cuda_hip/base/config.hpp" #include "common/cuda_hip/base/math.hpp" -#include "common/cuda_hip/base/runtime.hpp" #include "common/cuda_hip/base/types.hpp" #include "common/cuda_hip/components/cooperative_groups.hpp" -#include "common/cuda_hip/components/thread_ids.hpp" -#include "common/cuda_hip/matrix/batch_csr_kernels.hpp" -#include "common/cuda_hip/matrix/batch_dense_kernels.hpp" -#include "common/cuda_hip/matrix/batch_ell_kernels.hpp" #include "common/cuda_hip/matrix/batch_struct.hpp" #include "core/preconditioner/batch_jacobi_helpers.hpp" diff --git a/common/cuda_hip/preconditioner/batch_identity.hpp b/common/cuda_hip/preconditioner/batch_identity.hpp index 3d57bcae406..3fa6693c7ef 100644 --- a/common/cuda_hip/preconditioner/batch_identity.hpp +++ b/common/cuda_hip/preconditioner/batch_identity.hpp @@ -10,12 +10,8 @@ #include #include -#include "common/cuda_hip/base/batch_multi_vector_kernels.hpp" #include "common/cuda_hip/base/batch_struct.hpp" #include "common/cuda_hip/base/config.hpp" -#include "common/cuda_hip/matrix/batch_csr_kernels.hpp" -#include "common/cuda_hip/matrix/batch_dense_kernels.hpp" -#include "common/cuda_hip/matrix/batch_ell_kernels.hpp" #include "common/cuda_hip/matrix/batch_struct.hpp" diff --git a/common/cuda_hip/preconditioner/batch_scalar_jacobi.hpp b/common/cuda_hip/preconditioner/batch_scalar_jacobi.hpp index 42a4f3f6aa6..5cd8c28a1d0 100644 --- a/common/cuda_hip/preconditioner/batch_scalar_jacobi.hpp +++ b/common/cuda_hip/preconditioner/batch_scalar_jacobi.hpp @@ -11,17 +11,11 @@ #include #include -#include "common/cuda_hip/base/batch_multi_vector_kernels.hpp" #include "common/cuda_hip/base/batch_struct.hpp" #include "common/cuda_hip/base/config.hpp" #include "common/cuda_hip/base/math.hpp" -#include "common/cuda_hip/base/runtime.hpp" #include "common/cuda_hip/base/types.hpp" #include "common/cuda_hip/components/cooperative_groups.hpp" -#include "common/cuda_hip/components/thread_ids.hpp" -#include "common/cuda_hip/matrix/batch_csr_kernels.hpp" -#include "common/cuda_hip/matrix/batch_dense_kernels.hpp" -#include "common/cuda_hip/matrix/batch_ell_kernels.hpp" #include "common/cuda_hip/matrix/batch_struct.hpp" diff --git a/common/cuda_hip/solver/batch_bicgstab_kernels.hpp b/common/cuda_hip/solver/batch_bicgstab_kernels.hpp index 10d235358bc..8ea31358ed5 100644 --- a/common/cuda_hip/solver/batch_bicgstab_kernels.hpp +++ b/common/cuda_hip/solver/batch_bicgstab_kernels.hpp @@ -13,7 +13,6 @@ #include "common/cuda_hip/base/batch_struct.hpp" #include "common/cuda_hip/base/config.hpp" #include "common/cuda_hip/base/math.hpp" -#include "common/cuda_hip/base/runtime.hpp" #include "common/cuda_hip/base/types.hpp" #include "common/cuda_hip/components/cooperative_groups.hpp" #include "common/cuda_hip/components/thread_ids.hpp" diff --git a/cuda/solver/batch_bicgstab_kernels.cu b/cuda/solver/batch_bicgstab_kernels.cu index d3dc8712201..8a5eee6b196 100644 --- a/cuda/solver/batch_bicgstab_kernels.cu +++ b/cuda/solver/batch_bicgstab_kernels.cu @@ -4,25 +4,12 @@ #include "core/solver/batch_bicgstab_kernels.hpp" -#include -#include - #include #include -#include "common/cuda_hip/base/batch_multi_vector_kernels.hpp" #include "common/cuda_hip/base/batch_struct.hpp" #include "common/cuda_hip/base/config.hpp" -#include "common/cuda_hip/base/runtime.hpp" -#include "common/cuda_hip/base/thrust.hpp" #include "common/cuda_hip/base/types.hpp" -#include "common/cuda_hip/components/cooperative_groups.hpp" -#include "common/cuda_hip/components/reduction.hpp" -#include "common/cuda_hip/components/thread_ids.hpp" -#include "common/cuda_hip/components/warp_blas.hpp" -#include "common/cuda_hip/matrix/batch_csr_kernels.hpp" -#include "common/cuda_hip/matrix/batch_dense_kernels.hpp" -#include "common/cuda_hip/matrix/batch_ell_kernels.hpp" #include "common/cuda_hip/matrix/batch_struct.hpp" #include "common/cuda_hip/solver/batch_bicgstab_kernels.hpp" #include "core/base/batch_struct.hpp" diff --git a/cuda/solver/batch_cg_kernels.cu b/cuda/solver/batch_cg_kernels.cu index 3f7dac1d08a..32e66d7ee54 100644 --- a/cuda/solver/batch_cg_kernels.cu +++ b/cuda/solver/batch_cg_kernels.cu @@ -7,13 +7,9 @@ #include #include -#include "common/cuda_hip/base/batch_multi_vector_kernels.hpp" #include "common/cuda_hip/base/batch_struct.hpp" #include "common/cuda_hip/base/config.hpp" #include "common/cuda_hip/base/types.hpp" -#include "common/cuda_hip/matrix/batch_csr_kernels.hpp" -#include "common/cuda_hip/matrix/batch_dense_kernels.hpp" -#include "common/cuda_hip/matrix/batch_ell_kernels.hpp" #include "common/cuda_hip/matrix/batch_struct.hpp" #include "common/cuda_hip/solver/batch_cg_kernels.hpp" #include "core/base/batch_struct.hpp" diff --git a/hip/solver/batch_bicgstab_kernels.hip.cpp b/hip/solver/batch_bicgstab_kernels.hip.cpp index d44bc4a0eb6..17199d2cd19 100644 --- a/hip/solver/batch_bicgstab_kernels.hip.cpp +++ b/hip/solver/batch_bicgstab_kernels.hip.cpp @@ -4,9 +4,6 @@ #include "core/solver/batch_bicgstab_kernels.hpp" -#include -#include - #include #include @@ -15,15 +12,7 @@ #include "common/cuda_hip/base/config.hpp" #include "common/cuda_hip/base/math.hpp" #include "common/cuda_hip/base/runtime.hpp" -#include "common/cuda_hip/base/thrust.hpp" #include "common/cuda_hip/base/types.hpp" -#include "common/cuda_hip/components/cooperative_groups.hpp" -#include "common/cuda_hip/components/reduction.hpp" -#include "common/cuda_hip/components/thread_ids.hpp" -#include "common/cuda_hip/components/uninitialized_array.hpp" -#include "common/cuda_hip/matrix/batch_csr_kernels.hpp" -#include "common/cuda_hip/matrix/batch_dense_kernels.hpp" -#include "common/cuda_hip/matrix/batch_ell_kernels.hpp" #include "common/cuda_hip/matrix/batch_struct.hpp" #include "common/cuda_hip/solver/batch_bicgstab_kernels.hpp" #include "core/base/batch_struct.hpp" diff --git a/hip/solver/batch_cg_kernels.hip.cpp b/hip/solver/batch_cg_kernels.hip.cpp index c9a1e81be81..6d5e3bff3b3 100644 --- a/hip/solver/batch_cg_kernels.hip.cpp +++ b/hip/solver/batch_cg_kernels.hip.cpp @@ -4,26 +4,14 @@ #include "core/solver/batch_cg_kernels.hpp" -#include -#include - #include #include -#include "common/cuda_hip/base/batch_multi_vector_kernels.hpp" #include "common/cuda_hip/base/batch_struct.hpp" #include "common/cuda_hip/base/config.hpp" #include "common/cuda_hip/base/math.hpp" #include "common/cuda_hip/base/runtime.hpp" -#include "common/cuda_hip/base/thrust.hpp" #include "common/cuda_hip/base/types.hpp" -#include "common/cuda_hip/components/cooperative_groups.hpp" -#include "common/cuda_hip/components/reduction.hpp" -#include "common/cuda_hip/components/thread_ids.hpp" -#include "common/cuda_hip/components/uninitialized_array.hpp" -#include "common/cuda_hip/matrix/batch_csr_kernels.hpp" -#include "common/cuda_hip/matrix/batch_dense_kernels.hpp" -#include "common/cuda_hip/matrix/batch_ell_kernels.hpp" #include "common/cuda_hip/matrix/batch_struct.hpp" #include "common/cuda_hip/solver/batch_cg_kernels.hpp" #include "core/base/batch_struct.hpp"