[cuda, hip] reorg batch_logger

ginkgo-project · Aug 24, 2024 · b79c20b · b79c20b
1 parent edf139b
commit b79c20b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 57 deletions.
diff --git a/common/cuda_hip/log/batch_logger.hpp.inc → common/cuda_hip/log/batch_logger.hpp b/common/cuda_hip/log/batch_logger.hpp.inc → common/cuda_hip/log/batch_logger.hpp
@@ -2,6 +2,18 @@
 //
 // SPDX-License-Identifier: BSD-3-Clause
 
+#ifndef GKO_COMMON_CUDA_HIP_LOG_BATCH_LOGGER_HPP_
+#define GKO_COMMON_CUDA_HIP_LOG_BATCH_LOGGER_HPP_
+
+
+#include <ginkgo/core/base/types.hpp>
+
+
+namespace gko {
+namespace kernels {
+namespace GKO_DEVICE_NAMESPACE {
+namespace batch_log {
+
 /**
  * @see reference/log/batch_logger.hpp
  */
@@ -28,3 +40,12 @@ class SimpleFinalLogger final {
     real_type* const final_residuals_;
     idx_type* const final_iters_;
 };
+
+
+}  // namespace batch_log
+}  // namespace GKO_DEVICE_NAMESPACE
+}  // namespace kernels
+}  // namespace gko
+
+
+#endif
diff --git a/core/solver/batch_dispatch.hpp b/core/solver/batch_dispatch.hpp
@@ -25,10 +25,10 @@
 
 
 #include "common/cuda_hip/base/batch_struct.hpp"
+#include "common/cuda_hip/log/batch_logger.hpp"
 #include "common/cuda_hip/matrix/batch_struct.hpp"
 #include "common/cuda_hip/preconditioner/batch_preconditioners.hpp"
-#include "cuda/log/batch_logger.cuh"
-#include "cuda/stop/batch_criteria.cuh"
+#include "common/cuda_hip/stop/batch_criteria.hpp"
 
 
 namespace gko {
@@ -52,10 +52,10 @@ using DeviceValueType = typename gko::kernels::cuda::cuda_type<ValueType>;
 
 
 #include "common/cuda_hip/base/batch_struct.hpp"
+#include "common/cuda_hip/log/batch_logger.hpp"
 #include "common/cuda_hip/matrix/batch_struct.hpp"
 #include "common/cuda_hip/preconditioner/batch_preconditioners.hpp"
-#include "hip/log/batch_logger.hip.hpp"
-#include "hip/stop/batch_criteria.hip.hpp"
+#include "common/cuda_hip/stop/batch_criteria.hpp"
 
 
 namespace gko {

diff --git a/cuda/log/batch_logger.cuh b/cuda/log/batch_logger.cuh
diff --git a/hip/log/batch_logger.hip.hpp b/hip/log/batch_logger.hip.hpp