replace remaining usages of sparselib-specific macros

ginkgo-project · Jun 27, 2024 · 45505ea · 45505ea
1 parent fe3ec90
commit 45505ea
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 32 deletions.
diff --git a/benchmark/utils/cuda_linops.cpp b/benchmark/utils/cuda_linops.cpp
@@ -156,7 +156,7 @@ class CusparseCsrmp
         : gko::EnableLinOp<CusparseCsrmp, CusparseBase>(exec, size),
           csr_(std::move(
               csr::create(exec, std::make_shared<typename csr::classical>()))),
-          trans_(CUSPARSE_OPERATION_NON_TRANSPOSE)
+          trans_(SPARSELIB_OPERATION_NON_TRANSPOSE)
     {}
 
 private:
@@ -230,7 +230,7 @@ class CusparseCsr
         : gko::EnableLinOp<CusparseCsr, CusparseBase>(exec, size),
           csr_(std::move(
               csr::create(exec, std::make_shared<typename csr::classical>()))),
-          trans_(CUSPARSE_OPERATION_NON_TRANSPOSE)
+          trans_(SPARSELIB_OPERATION_NON_TRANSPOSE)
     {}
 
 private:
@@ -306,7 +306,7 @@ class CusparseCsrmm
         : gko::EnableLinOp<CusparseCsrmm, CusparseBase>(exec, size),
           csr_(std::move(
               csr::create(exec, std::make_shared<typename csr::classical>()))),
-          trans_(CUSPARSE_OPERATION_NON_TRANSPOSE)
+          trans_(SPARSELIB_OPERATION_NON_TRANSPOSE)
     {}
 
 private:
@@ -407,7 +407,7 @@ class CusparseCsrEx
         : gko::EnableLinOp<CusparseCsrEx, CusparseBase>(exec, size),
           csr_(std::move(
               csr::create(exec, std::make_shared<typename csr::classical>()))),
-          trans_(CUSPARSE_OPERATION_NON_TRANSPOSE),
+          trans_(SPARSELIB_OPERATION_NON_TRANSPOSE),
           buffer_(exec)
     {
         algmode_ = CUSPARSE_ALG_MERGE_PATH;
@@ -508,7 +508,7 @@ class CusparseHybrid
     CusparseHybrid(std::shared_ptr<const gko::Executor> exec,
                    const gko::dim<2>& size = gko::dim<2>{})
         : gko::EnableLinOp<CusparseHybrid, CusparseBase>(exec, size),
-          trans_(CUSPARSE_OPERATION_NON_TRANSPOSE)
+          trans_(SPARSELIB_OPERATION_NON_TRANSPOSE)
     {
         auto guard = this->get_gpu_exec()->get_scoped_device_id_guard();
         GKO_ASSERT_NO_CUSPARSE_ERRORS(cusparseCreateHybMat(&hyb_));
@@ -654,7 +654,7 @@ class CusparseGenericCsr
         : gko::EnableLinOp<CusparseGenericCsr, CusparseBase>(exec, size),
           csr_(std::move(
               csr::create(exec, std::make_shared<typename csr::classical>()))),
-          trans_(CUSPARSE_OPERATION_NON_TRANSPOSE)
+          trans_(SPARSELIB_OPERATION_NON_TRANSPOSE)
     {}
 
 private:
@@ -745,7 +745,7 @@ class CusparseGenericCoo
                        const gko::dim<2>& size = gko::dim<2>{})
         : gko::EnableLinOp<CusparseGenericCoo, CusparseBase>(exec, size),
           coo_(std::move(coo::create(exec))),
-          trans_(CUSPARSE_OPERATION_NON_TRANSPOSE)
+          trans_(SPARSELIB_OPERATION_NON_TRANSPOSE)
     {}
 
 private:

diff --git a/benchmark/utils/hip_linops.hip.cpp b/benchmark/utils/hip_linops.hip.cpp
@@ -143,7 +143,7 @@ class HipsparseCsr
         : gko::EnableLinOp<HipsparseCsr, HipsparseBase>(exec, size),
           csr_(std::move(
               csr::create(exec, std::make_shared<typename csr::classical>()))),
-          trans_(HIPSPARSE_OPERATION_NON_TRANSPOSE)
+          trans_(SPARSELIB_OPERATION_NON_TRANSPOSE)
     {}
 
 private:
@@ -219,7 +219,7 @@ class HipsparseCsrmm
         : gko::EnableLinOp<HipsparseCsrmm, HipsparseBase>(exec, size),
           csr_(std::move(
               csr::create(exec, std::make_shared<typename csr::classical>()))),
-          trans_(HIPSPARSE_OPERATION_NON_TRANSPOSE)
+          trans_(SPARSELIB_OPERATION_NON_TRANSPOSE)
     {}
 
 private:
@@ -312,7 +312,7 @@ class HipsparseHybrid
     HipsparseHybrid(std::shared_ptr<const gko::Executor> exec,
                     const gko::dim<2>& size = gko::dim<2>{})
         : gko::EnableLinOp<HipsparseHybrid, HipsparseBase>(exec, size),
-          trans_(HIPSPARSE_OPERATION_NON_TRANSPOSE)
+          trans_(SPARSELIB_OPERATION_NON_TRANSPOSE)
     {
         auto guard = this->get_gpu_exec()->get_scoped_device_id_guard();
         GKO_ASSERT_NO_HIPSPARSE_ERRORS(hipsparseCreateHybMat(&hyb_));

diff --git a/cuda/base/cusparse_bindings.hpp b/cuda/base/cusparse_bindings.hpp
@@ -522,8 +522,8 @@ void spgemm_work_estimation(cusparseHandle_t handle, const ValueType* alpha,
                             size_type& buffer1_size, void* buffer1)
 {
     GKO_ASSERT_NO_CUSPARSE_ERRORS(cusparseSpGEMM_workEstimation(
-        handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-        CUSPARSE_OPERATION_NON_TRANSPOSE, alpha, a_descr, b_descr, beta,
+        handle, SPARSELIB_OPERATION_NON_TRANSPOSE,
+        SPARSELIB_OPERATION_NON_TRANSPOSE, alpha, a_descr, b_descr, beta,
         c_descr, cuda_data_type<ValueType>(), CUSPARSE_SPGEMM_DEFAULT,
         spgemm_descr, &buffer1_size, buffer1));
 }
@@ -537,8 +537,8 @@ void spgemm_compute(cusparseHandle_t handle, const ValueType* alpha,
                     size_type& buffer2_size, void* buffer2)
 {
     GKO_ASSERT_NO_CUSPARSE_ERRORS(cusparseSpGEMM_compute(
-        handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-        CUSPARSE_OPERATION_NON_TRANSPOSE, alpha, a_descr, b_descr, beta,
+        handle, SPARSELIB_OPERATION_NON_TRANSPOSE,
+        SPARSELIB_OPERATION_NON_TRANSPOSE, alpha, a_descr, b_descr, beta,
         c_descr, cuda_data_type<ValueType>(), CUSPARSE_SPGEMM_DEFAULT,
         spgemm_descr, &buffer2_size, buffer2));
 }
@@ -551,8 +551,8 @@ void spgemm_copy(cusparseHandle_t handle, const ValueType* alpha,
                  cusparseSpGEMMDescr_t spgemm_descr)
 {
     GKO_ASSERT_NO_CUSPARSE_ERRORS(
-        cusparseSpGEMM_copy(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                            CUSPARSE_OPERATION_NON_TRANSPOSE, alpha, a_descr,
+        cusparseSpGEMM_copy(handle, SPARSELIB_OPERATION_NON_TRANSPOSE,
+                            SPARSELIB_OPERATION_NON_TRANSPOSE, alpha, a_descr,
                             b_descr, beta, c_descr, cuda_data_type<ValueType>(),
                             CUSPARSE_SPGEMM_DEFAULT, spgemm_descr));
 }

diff --git a/cuda/solver/common_trs_kernels.cuh b/cuda/solver/common_trs_kernels.cuh
@@ -102,14 +102,14 @@ struct CudaSolveStruct : gko::solver::SolveStruct {
             reinterpret_cast<ValueType*>(0xDEAF0));
 
         auto work_size = sparselib::spsm_buffer_size(
-            handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-            CUSPARSE_OPERATION_NON_TRANSPOSE, one<ValueType>(), descr_a,
+            handle, SPARSELIB_OPERATION_NON_TRANSPOSE,
+            SPARSELIB_OPERATION_NON_TRANSPOSE, one<ValueType>(), descr_a,
             descr_b, descr_c, CUSPARSE_SPSM_ALG_DEFAULT, spsm_descr);
 
         work.resize_and_reset(work_size);
 
-        sparselib::spsm_analysis(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                 CUSPARSE_OPERATION_NON_TRANSPOSE,
+        sparselib::spsm_analysis(handle, SPARSELIB_OPERATION_NON_TRANSPOSE,
+                                 SPARSELIB_OPERATION_NON_TRANSPOSE,
                                  one<ValueType>(), descr_a, descr_b, descr_c,
                                  CUSPARSE_SPSM_ALG_DEFAULT, spsm_descr,
                                  work.get_data());
@@ -141,8 +141,8 @@ struct CudaSolveStruct : gko::solver::SolveStruct {
         auto descr_c = sparselib::create_dnmat(
             output->get_size(), output->get_stride(), output->get_values());
 
-        sparselib::spsm_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                              CUSPARSE_OPERATION_NON_TRANSPOSE,
+        sparselib::spsm_solve(handle, SPARSELIB_OPERATION_NON_TRANSPOSE,
+                              SPARSELIB_OPERATION_NON_TRANSPOSE,
                               one<ValueType>(), descr_a, descr_b, descr_c,
                               CUSPARSE_SPSM_ALG_DEFAULT, spsm_descr);
 
@@ -215,8 +215,8 @@ struct CudaSolveStruct : gko::solver::SolveStruct {
         size_type work_size{};
 
         sparselib::buffer_size_ext(
-            handle, algorithm, CUSPARSE_OPERATION_NON_TRANSPOSE,
-            CUSPARSE_OPERATION_TRANSPOSE, matrix->get_size()[0], num_rhs,
+            handle, algorithm, SPARSELIB_OPERATION_NON_TRANSPOSE,
+            SPARSELIB_OPERATION_TRANSPOSE, matrix->get_size()[0], num_rhs,
             matrix->get_num_stored_elements(), one<ValueType>(), factor_descr,
             matrix->get_const_values(), matrix->get_const_row_ptrs(),
             matrix->get_const_col_idxs(), nullptr, num_rhs, solve_info, policy,
@@ -226,8 +226,8 @@ struct CudaSolveStruct : gko::solver::SolveStruct {
         work.resize_and_reset(work_size);
 
         sparselib::csrsm2_analysis(
-            handle, algorithm, CUSPARSE_OPERATION_NON_TRANSPOSE,
-            CUSPARSE_OPERATION_TRANSPOSE, matrix->get_size()[0], num_rhs,
+            handle, algorithm, SPARSELIB_OPERATION_NON_TRANSPOSE,
+            SPARSELIB_OPERATION_TRANSPOSE, matrix->get_size()[0], num_rhs,
             matrix->get_num_stored_elements(), one<ValueType>(), factor_descr,
             matrix->get_const_values(), matrix->get_const_row_ptrs(),
             matrix->get_const_col_idxs(), nullptr, num_rhs, solve_info, policy,
@@ -253,8 +253,8 @@ struct CudaSolveStruct : gko::solver::SolveStruct {
         sparselib::pointer_mode_guard pm_guard(handle);
         dense::copy(exec, input, output);
         sparselib::csrsm2_solve(
-            handle, algorithm, CUSPARSE_OPERATION_NON_TRANSPOSE,
-            CUSPARSE_OPERATION_TRANSPOSE, matrix->get_size()[0],
+            handle, algorithm, SPARSELIB_OPERATION_NON_TRANSPOSE,
+            SPARSELIB_OPERATION_TRANSPOSE, matrix->get_size()[0],
             output->get_stride(), matrix->get_num_stored_elements(),
             one<ValueType>(), factor_descr, matrix->get_const_values(),
             matrix->get_const_row_ptrs(), matrix->get_const_col_idxs(),

diff --git a/hip/solver/common_trs_kernels.hip.hpp b/hip/solver/common_trs_kernels.hip.hpp
@@ -125,7 +125,7 @@ void generate_kernel(std::shared_ptr<const HipExecutor> exec,
             {
                 sparselib::pointer_mode_guard pm_guard(handle);
                 sparselib::csrsv2_buffer_size(
-                    handle, HIPSPARSE_OPERATION_NON_TRANSPOSE,
+                    handle, SPARSELIB_OPERATION_NON_TRANSPOSE,
                     matrix->get_size()[0], matrix->get_num_stored_elements(),
                     hip_solve_struct->factor_descr, matrix->get_const_values(),
                     matrix->get_const_row_ptrs(), matrix->get_const_col_idxs(),
@@ -140,7 +140,7 @@ void generate_kernel(std::shared_ptr<const HipExecutor> exec,
                     exec->alloc<void*>(hip_solve_struct->factor_work_size);
 
                 sparselib::csrsv2_analysis(
-                    handle, HIPSPARSE_OPERATION_NON_TRANSPOSE,
+                    handle, SPARSELIB_OPERATION_NON_TRANSPOSE,
                     matrix->get_size()[0], matrix->get_num_stored_elements(),
                     hip_solve_struct->factor_descr, matrix->get_const_values(),
                     matrix->get_const_row_ptrs(), matrix->get_const_col_idxs(),
@@ -180,7 +180,7 @@ void solve_kernel(std::shared_ptr<const HipExecutor> exec,
                 sparselib::pointer_mode_guard pm_guard(handle);
                 if (b->get_stride() == 1) {
                     sparselib::csrsv2_solve(
-                        handle, HIPSPARSE_OPERATION_NON_TRANSPOSE,
+                        handle, SPARSELIB_OPERATION_NON_TRANSPOSE,
                         matrix->get_size()[0],
                         matrix->get_num_stored_elements(), &one,
                         hip_solve_struct->factor_descr,
@@ -195,7 +195,7 @@ void solve_kernel(std::shared_ptr<const HipExecutor> exec,
                     dense::transpose(exec, x, trans_x);
                     for (IndexType i = 0; i < trans_b->get_size()[0]; i++) {
                         sparselib::csrsv2_solve(
-                            handle, HIPSPARSE_OPERATION_NON_TRANSPOSE,
+                            handle, SPARSELIB_OPERATION_NON_TRANSPOSE,
                             matrix->get_size()[0],
                             matrix->get_num_stored_elements(), &one,
                             hip_solve_struct->factor_descr,