Skip to content

Commit 41f2d63

Browse files
authored
Fix compiling failure in CI test (#4198)
1 parent 615828b commit 41f2d63

File tree

1 file changed

+27
-26
lines changed

1 file changed

+27
-26
lines changed

source/module_hsolver/kernels/test/perf_math_kernel.cpp

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "module_base/blas_connector.h"
22
#include "module_base/constants.h"
3+
#include "module_base/module_device/memory_op.h"
34
#include "module_hsolver/kernels/math_kernel_op.h"
45
#include "module_psi/kernels/memory_op.h"
56

@@ -37,7 +38,7 @@ class PerfModuleHsolverMathKernel : public benchmark::Fixture {
3738
public:
3839

3940
// DEVICE SYMBOL
40-
const psi::DEVICE_CPU* cpu_ctx = {};
41+
const base_device::DEVICE_CPU* cpu_ctx = {};
4142

4243
int dim_vector = 1;
4344

@@ -53,24 +54,24 @@ class PerfModuleHsolverMathKernel : public benchmark::Fixture {
5354
std::complex<double> zconstant_a = {1.0,1.0};
5455

5556
#if __CUDA || __UT_USE_CUDA || __ROCM || __UT_USE_ROCM
56-
const psi::DEVICE_GPU * gpu_ctx = {};
57+
const base_device::DEVICE_GPU * gpu_ctx = {};
5758

5859
// from CPU to GPU
5960
using synchronize_memory_op
60-
= psi::memory::synchronize_memory_op<std::complex<double>, psi::DEVICE_GPU, psi::DEVICE_CPU>;
61+
= base_device::memory::synchronize_memory_op<std::complex<double>, base_device::DEVICE_GPU, base_device::DEVICE_CPU>;
6162

6263
// form GPU to CPU
6364
using synchronize_memory_op_gpu
64-
= psi::memory::synchronize_memory_op<std::complex<double>, psi::DEVICE_CPU, psi::DEVICE_GPU>;
65+
= base_device::memory::synchronize_memory_op<std::complex<double>, base_device::DEVICE_CPU, base_device::DEVICE_GPU>;
6566

66-
using resize_memory_op = psi::memory::resize_memory_op<std::complex<double>, psi::DEVICE_GPU>;
67-
using delete_memory_op = psi::memory::delete_memory_op<std::complex<double>, psi::DEVICE_GPU>;
68-
using resize_memory_op_double = psi::memory::resize_memory_op<double, psi::DEVICE_GPU>;
69-
using delete_memory_op_double = psi::memory::delete_memory_op<double, psi::DEVICE_GPU>;
70-
using synchronize_memory_op_double = psi::memory::synchronize_memory_op<double, psi::DEVICE_GPU, psi::DEVICE_CPU>;
67+
using resize_memory_op = base_device::memory::resize_memory_op<std::complex<double>, base_device::DEVICE_GPU>;
68+
using delete_memory_op = base_device::memory::delete_memory_op<std::complex<double>, base_device::DEVICE_GPU>;
69+
using resize_memory_op_double = base_device::memory::resize_memory_op<double, base_device::DEVICE_GPU>;
70+
using delete_memory_op_double = base_device::memory::delete_memory_op<double, base_device::DEVICE_GPU>;
71+
using synchronize_memory_op_double = base_device::memory::synchronize_memory_op<double, base_device::DEVICE_GPU, base_device::DEVICE_CPU>;
7172

72-
using set_memory_op = psi::memory::set_memory_op<std::complex<double>, psi::DEVICE_GPU>;
73-
using set_memory_op_double = psi::memory::set_memory_op<double, psi::DEVICE_GPU>;
73+
using set_memory_op = base_device::memory::set_memory_op<std::complex<double>, base_device::DEVICE_GPU>;
74+
using set_memory_op_double = base_device::memory::set_memory_op<double, base_device::DEVICE_GPU>;
7475

7576
std::complex<double>* test_zvector_a_gpu = nullptr;
7677
std::complex<double>* test_zvector_b_gpu = nullptr;
@@ -132,29 +133,29 @@ class PerfModuleHsolverMathKernel : public benchmark::Fixture {
132133

133134
// OPs need benchmark
134135
// CPU operator
135-
using zdot_real_cpu_op = hsolver::dot_real_op<std::complex<double>, psi::DEVICE_CPU>;
136+
using zdot_real_cpu_op = hsolver::dot_real_op<std::complex<double>, base_device::DEVICE_CPU>;
136137

137-
using vector_div_constant_op_cpu = hsolver::vector_div_constant_op<std::complex<double>, psi::DEVICE_CPU>;
138-
using vector_mul_vector_op_cpu = hsolver::vector_mul_vector_op<std::complex<double>, psi::DEVICE_CPU>;
139-
using vector_div_vector_op_cpu = hsolver::vector_div_vector_op<std::complex<double>, psi::DEVICE_CPU>;
138+
using vector_div_constant_op_cpu = hsolver::vector_div_constant_op<std::complex<double>, base_device::DEVICE_CPU>;
139+
using vector_mul_vector_op_cpu = hsolver::vector_mul_vector_op<std::complex<double>, base_device::DEVICE_CPU>;
140+
using vector_div_vector_op_cpu = hsolver::vector_div_vector_op<std::complex<double>, base_device::DEVICE_CPU>;
140141
using constantvector_addORsub_constantVector_op_cpu
141-
= hsolver::constantvector_addORsub_constantVector_op<std::complex<double>, psi::DEVICE_CPU>;
142-
using axpy_op_cpu = hsolver::axpy_op<std::complex<double>, psi::DEVICE_CPU>;
143-
using scal_op_cpu = hsolver::scal_op<double, psi::DEVICE_CPU>;
144-
using gemv_op_cpu = hsolver::gemv_op<std::complex<double>, psi::DEVICE_CPU>;
142+
= hsolver::constantvector_addORsub_constantVector_op<std::complex<double>, base_device::DEVICE_CPU>;
143+
using axpy_op_cpu = hsolver::axpy_op<std::complex<double>, base_device::DEVICE_CPU>;
144+
using scal_op_cpu = hsolver::scal_op<double, base_device::DEVICE_CPU>;
145+
using gemv_op_cpu = hsolver::gemv_op<std::complex<double>, base_device::DEVICE_CPU>;
145146

146147
#if __CUDA || __UT_USE_CUDA || __ROCM || __UT_USE_ROCM
147148

148149
// GPU operator
149-
using zdot_real_gpu_op = hsolver::dot_real_op<std::complex<double>, psi::DEVICE_GPU>;
150+
using zdot_real_gpu_op = hsolver::dot_real_op<std::complex<double>, base_device::DEVICE_GPU>;
150151

151-
using vector_div_constant_op_gpu = hsolver::vector_div_constant_op<std::complex<double>, psi::DEVICE_GPU>;
152-
using vector_mul_vector_op_gpu = hsolver::vector_mul_vector_op<std::complex<double>, psi::DEVICE_GPU>;
153-
using vector_div_vector_op_gpu = hsolver::vector_div_vector_op<std::complex<double>, psi::DEVICE_GPU>;
152+
using vector_div_constant_op_gpu = hsolver::vector_div_constant_op<std::complex<double>, base_device::DEVICE_GPU>;
153+
using vector_mul_vector_op_gpu = hsolver::vector_mul_vector_op<std::complex<double>, base_device::DEVICE_GPU>;
154+
using vector_div_vector_op_gpu = hsolver::vector_div_vector_op<std::complex<double>, base_device::DEVICE_GPU>;
154155
using constantvector_addORsub_constantVector_op_gpu
155-
= hsolver::constantvector_addORsub_constantVector_op<std::complex<double>, psi::DEVICE_GPU>;
156-
using axpy_op_gpu = hsolver::axpy_op<std::complex<double>, psi::DEVICE_GPU>;
157-
using scal_op_gpu = hsolver::scal_op<double, psi::DEVICE_GPU>;
156+
= hsolver::constantvector_addORsub_constantVector_op<std::complex<double>, base_device::DEVICE_GPU>;
157+
using axpy_op_gpu = hsolver::axpy_op<std::complex<double>, base_device::DEVICE_GPU>;
158+
using scal_op_gpu = hsolver::scal_op<double, base_device::DEVICE_GPU>;
158159

159160
#endif // __CUDA || __UT_USE_CUDA || __ROCM || __UT_USE_ROCM
160161
};

0 commit comments

Comments
 (0)