Skip to content

Commit

Permalink
fix includes
Browse files Browse the repository at this point in the history
  • Loading branch information
@upsj
upsj committed May 20, 2024
1 parent 291b71e commit abbbff8
Show file tree
Hide file tree
Showing 26 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion common/cuda_hip/base/kernel_launch.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#endif


#include <accessor/device_helper.hpp>
#include <accessor/cuda_hip_helper.hpp>


#include <thrust/tuple.h>
Expand Down
2 changes: 1 addition & 1 deletion common/cuda_hip/base/pointer_mode_guard.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#ifdef GKO_COMPILING_HIP
#include "hip/base/pointer_mode_guard.hip.hpp"
#else // GKO_COMPILING_CUDA
#include "cuda/base/pointer_mode_guard.cuh"
#include "common/cuda_hip/base/pointer_mode_guard.hpp"
#endif


Expand Down
2 changes: 1 addition & 1 deletion common/cuda_hip/components/format_conversion.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifdef GKO_COMPILING_HIP
#include "hip/components/format_conversion.hip.hpp"
#else // GKO_COMPILING_CUDA
#include "cuda/components/format_conversion.cuh"
#include "common/cuda_hip/components/format_conversion.hpp"
#endif


Expand Down
2 changes: 1 addition & 1 deletion common/cuda_hip/components/memory.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifdef GKO_COMPILING_HIP
#include "hip/components/memory.hip.hpp"
#else // GKO_COMPILING_CUDA
#include "cuda/components/memory.cuh"
#include "common/cuda_hip/components/memory.hpp"
#endif


Expand Down
2 changes: 1 addition & 1 deletion common/cuda_hip/matrix/ell_kernels.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: BSD-3-Clause

#include <accessor/device_helper.hpp>
#include <accessor/cuda_hip_helper.hpp>
#include <array>


Expand Down
6 changes: 3 additions & 3 deletions cuda/matrix/fbcsr_kernels.instantiate.cu → ..._hip/matrix/fbcsr_kernels.instantiate.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
//
// SPDX-License-Identifier: BSD-3-Clause

#include "cuda/matrix/fbcsr_kernels.template.cu"
#include "common/cuda_hip/matrix/fbcsr_kernels.template.cpp"


namespace gko {
namespace kernels {
namespace cuda {
namespace GKO_DEVICE_NAMESPACE {
/**
* @brief The fixed-size block compressed sparse row matrix format namespace.
*
Expand Down Expand Up @@ -42,6 +42,6 @@ GKO_INSTANTIATE_FOR_EACH_VALUE_AND_INDEX_TYPE(


} // namespace fbcsr
} // namespace cuda
} // namespace GKO_DEVICE_NAMESPACE
} // namespace kernels
} // namespace gko
0 common/cuda_hip/matrix/fbcsr_kernels.cpp → ...uda_hip/matrix/fbcsr_kernels.template.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion common/cuda_hip/matrix/sparsity_csr_kernels.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: BSD-3-Clause

#include <accessor/device_helper.hpp>
#include <accessor/cuda_hip_helper.hpp>


#include <thrust/sort.h>
Expand Down
2 changes: 1 addition & 1 deletion common/cuda_hip/solver/cb_gmres_kernels.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: BSD-3-Clause

#include <accessor/device_helper.hpp>
#include <accessor/cuda_hip_helper.hpp>
#include <algorithm>


Expand Down
4 changes: 2 additions & 2 deletions common/unified/base/kernel_launch.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#define GKO_DEVICE_NAMESPACE cuda
#define GKO_KERNEL __device__
#include "cuda/base/types.hpp"
#include "common/cuda_hip/base/types.hpp"


namespace gko {
Expand Down Expand Up @@ -271,7 +271,7 @@ typename to_device_type_impl<T>::type map_to_device(T&& param)


#if defined(GKO_COMPILING_CUDA)
#include "cuda/base/kernel_launch.cuh"
#include "common/cuda_hip/base/kernel_launch.hpp"
#elif defined(GKO_COMPILING_HIP)
#include "hip/base/kernel_launch.hip.hpp"
#elif defined(GKO_COMPILING_DPCPP)
Expand Down
2 changes: 1 addition & 1 deletion common/unified/base/kernel_launch_reduction.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@


#if defined(GKO_COMPILING_CUDA)
#include "cuda/base/kernel_launch_reduction.cuh"
#include "common/cuda_hip/base/kernel_launch_reduction.hpp"
#elif defined(GKO_COMPILING_HIP)
#include "hip/base/kernel_launch_reduction.hip.hpp"
#elif defined(GKO_COMPILING_DPCPP)
Expand Down
2 changes: 1 addition & 1 deletion common/unified/base/kernel_launch_solver.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ const device_type<ValueType>* row_vector(const matrix::Dense<ValueType>* mtx)


#if defined(GKO_COMPILING_CUDA)
#include "cuda/base/kernel_launch_solver.cuh"
#include "common/cuda_hip/base/kernel_launch_solver.hpp"
#elif defined(GKO_COMPILING_HIP)
#include "hip/base/kernel_launch_solver.hip.hpp"
#elif defined(GKO_COMPILING_DPCPP)
Expand Down
2 changes: 1 addition & 1 deletion cuda/base/config.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <ginkgo/core/base/types.hpp>


#include "cuda/base/math.hpp"
#include "common/cuda_hip/base/math.hpp"


namespace gko {
Expand Down
2 changes: 1 addition & 1 deletion cuda/base/cublas_bindings.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <ginkgo/core/base/exception_helpers.hpp>


#include "cuda/base/math.hpp"
#include "common/cuda_hip/base/math.hpp"
#include "cuda/base/types.hpp"


Expand Down
2 changes: 1 addition & 1 deletion cuda/base/curand_bindings.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <ginkgo/core/base/exception_helpers.hpp>


#include "cuda/base/math.hpp"
#include "common/cuda_hip/base/math.hpp"
#include "cuda/base/types.hpp"


Expand Down
2 changes: 1 addition & 1 deletion cuda/components/format_conversion.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@


#include "cuda/components/cooperative_groups.cuh"
#include "cuda/components/thread_ids.cuh"
#include "common/cuda_hip/components/thread_ids.hpp"


#ifdef GINKGO_BENCHMARK_ENABLE_TUNING
Expand Down
18 changes: 9 additions & 9 deletions cuda/matrix/csr_kernels.template.cu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@
#include "core/synthesizer/implementation_selection.hpp"
#include "cuda/base/config.hpp"
#include "cuda/base/cusparse_bindings.hpp"
#include "cuda/base/math.hpp"
#include "common/cuda_hip/base/math.hpp"
#include "cuda/base/pointer_mode_guard.hpp"
#include "cuda/base/thrust.cuh"
#include "cuda/base/types.hpp"
#include "cuda/components/atomic.cuh"
#include "common/cuda_hip/components/atomic.hpp"
#include "cuda/components/cooperative_groups.cuh"
#include "cuda/components/format_conversion.cuh"
#include "cuda/components/intrinsics.cuh"
#include "cuda/components/merging.cuh"
#include "cuda/components/prefix_sum.cuh"
#include "cuda/components/reduction.cuh"
#include "cuda/components/segment_scan.cuh"
#include "cuda/components/thread_ids.cuh"
#include "cuda/components/uninitialized_array.hpp"
#include "common/cuda_hip/components/intrinsics.hpp"
#include "common/cuda_hip/components/merging.hpp"
#include "common/cuda_hip/components/prefix_sum.hpp"
#include "common/cuda_hip/components/reduction.hpp"
#include "common/cuda_hip/components/segment_scan.hpp"
#include "common/cuda_hip/components/thread_ids.hpp"
#include "common/cuda_hip/components/uninitialized_array.hpp"


namespace gko {
Expand Down
8 changes: 4 additions & 4 deletions cuda/solver/common_trs_kernels.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
#include "core/matrix/dense_kernels.hpp"
#include "core/synthesizer/implementation_selection.hpp"
#include "cuda/base/cusparse_bindings.hpp"
#include "cuda/base/math.hpp"
#include "common/cuda_hip/base/math.hpp"
#include "cuda/base/pointer_mode_guard.hpp"
#include "cuda/base/types.hpp"
#include "cuda/components/atomic.cuh"
#include "common/cuda_hip/components/atomic.hpp"
#include "cuda/components/memory.cuh"
#include "cuda/components/thread_ids.cuh"
#include "cuda/components/uninitialized_array.hpp"
#include "common/cuda_hip/components/thread_ids.hpp"
#include "common/cuda_hip/components/uninitialized_array.hpp"


namespace gko {
Expand Down
2 changes: 1 addition & 1 deletion cuda/solver/lower_trs_kernels.cu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@


#include "cuda/base/cusparse_bindings.hpp"
#include "cuda/base/math.hpp"
#include "common/cuda_hip/base/math.hpp"
#include "cuda/base/types.hpp"
#include "cuda/solver/common_trs_kernels.cuh"

Expand Down
2 changes: 1 addition & 1 deletion cuda/solver/upper_trs_kernels.cu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@


#include "cuda/base/cusparse_bindings.hpp"
#include "cuda/base/math.hpp"
#include "common/cuda_hip/base/math.hpp"
#include "cuda/base/types.hpp"
#include "cuda/solver/common_trs_kernels.cuh"

Expand Down
4 changes: 2 additions & 2 deletions cuda/stop/criterion_kernels.cu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
#include <ginkgo/core/stop/stopping_status.hpp>


#include "cuda/base/math.hpp"
#include "common/cuda_hip/base/math.hpp"
#include "cuda/base/types.hpp"
#include "cuda/components/thread_ids.cuh"
#include "common/cuda_hip/components/thread_ids.hpp"


namespace gko {
Expand Down
4 changes: 2 additions & 2 deletions cuda/stop/residual_norm_kernels.cu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@


#include "core/base/array_access.hpp"
#include "cuda/base/math.hpp"
#include "common/cuda_hip/base/math.hpp"
#include "cuda/base/types.hpp"
#include "cuda/components/thread_ids.cuh"
#include "common/cuda_hip/components/thread_ids.hpp"


namespace gko {
Expand Down
2 changes: 1 addition & 1 deletion cuda/test/base/math.cu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <ginkgo/core/base/executor.hpp>


#include "cuda/base/math.hpp"
#include "common/cuda_hip/base/math.hpp"
#include "cuda/base/types.hpp"
#include "cuda/test/utils.hpp"

Expand Down
2 changes: 1 addition & 1 deletion cuda/test/components/merging.cu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: BSD-3-Clause

#include "cuda/components/merging.cuh"
#include "common/cuda_hip/components/merging.hpp"


#include <algorithm>
Expand Down
2 changes: 1 addition & 1 deletion cuda/test/components/searching.cu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: BSD-3-Clause

#include "cuda/components/searching.cuh"
#include "common/cuda_hip/components/searching.hpp"


#include <memory>
Expand Down
2 changes: 1 addition & 1 deletion cuda/test/components/sorting.cu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: BSD-3-Clause

#include "cuda/components/sorting.cuh"
#include "common/cuda_hip/components/sorting.hpp"


#include <memory>
Expand Down

0 comments on commit abbbff8

Please sign in to comment.