Skip to content

Commit 17b75b9

Browse files
Critsium-xyCritsium-xy
committed
Remove ctx in constantVector_addOrsub_constantVector
1 parent 75814ab commit 17b75b9

File tree

8 files changed

+18
-29
lines changed

8 files changed

+18
-29
lines changed

‎source/module_base/blas_connector.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ void vector_add_vector(const int& dim, float *result, const float *vector1, cons
706706
}
707707
else if (device_type == base_device::GpuDevice){
708708
#ifdef __CUDA
709-
ModuleBase::constantvector_addORsub_constantVector_op<float, base_device::DEVICE_GPU>()(gpu_ctx, dim, result, vector1, constant1, vector2, constant2);
709+
ModuleBase::constantvector_addORsub_constantVector_op<float, base_device::DEVICE_GPU>()(dim, result, vector1, constant1, vector2, constant2);
710710
#endif
711711
}
712712
}
@@ -724,7 +724,7 @@ void vector_add_vector(const int& dim, double *result, const double *vector1, co
724724
}
725725
else if (device_type == base_device::GpuDevice){
726726
#ifdef __CUDA
727-
ModuleBase::constantvector_addORsub_constantVector_op<double, base_device::DEVICE_GPU>()(gpu_ctx, dim, result, vector1, constant1, vector2, constant2);
727+
ModuleBase::constantvector_addORsub_constantVector_op<double, base_device::DEVICE_GPU>()(dim, result, vector1, constant1, vector2, constant2);
728728
#endif
729729
}
730730
}
@@ -742,7 +742,7 @@ void vector_add_vector(const int& dim, std::complex<float> *result, const std::c
742742
}
743743
else if (device_type == base_device::GpuDevice){
744744
#ifdef __CUDA
745-
ModuleBase::constantvector_addORsub_constantVector_op<std::complex<float>, base_device::DEVICE_GPU>()(gpu_ctx, dim, result, vector1, constant1, vector2, constant2);
745+
ModuleBase::constantvector_addORsub_constantVector_op<std::complex<float>, base_device::DEVICE_GPU>()(dim, result, vector1, constant1, vector2, constant2);
746746
#endif
747747
}
748748
}
@@ -760,7 +760,7 @@ void vector_add_vector(const int& dim, std::complex<double> *result, const std::
760760
}
761761
else if (device_type == base_device::GpuDevice){
762762
#ifdef __CUDA
763-
ModuleBase::constantvector_addORsub_constantVector_op<std::complex<double>, base_device::DEVICE_GPU>()(gpu_ctx, dim, result, vector1, constant1, vector2, constant2);
763+
ModuleBase::constantvector_addORsub_constantVector_op<std::complex<double>, base_device::DEVICE_GPU>()(dim, result, vector1, constant1, vector2, constant2);
764764
#endif
765765
}
766766
}

‎source/module_base/kernels/cuda/math_kernel_op.cu‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -643,8 +643,7 @@ void vector_div_vector_op<std::complex<double>, base_device::DEVICE_GPU>::operat
643643
}
644644
// vector operator: result[i] = vector1[i] * constant1 + vector2[i] * constant2
645645
template <typename T>
646-
void constantvector_addORsub_constantVector_op<T, base_device::DEVICE_GPU>::operator()(const base_device::DEVICE_GPU* d,
647-
const int& dim,
646+
void constantvector_addORsub_constantVector_op<T, base_device::DEVICE_GPU>::operator()(const int& dim,
648647
T* result,
649648
const T* vector1,
650649
const Real constant1,

‎source/module_base/kernels/math_kernel_op.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,7 @@ template <typename T>
199199
struct constantvector_addORsub_constantVector_op<T, base_device::DEVICE_CPU>
200200
{
201201
using Real = typename GetTypeReal<T>::type;
202-
void operator()(const base_device::DEVICE_CPU* d,
203-
const int& dim,
202+
void operator()(const int& dim,
204203
T* result,
205204
const T* vector1,
206205
const Real constant1,

‎source/module_base/kernels/math_kernel_op.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ struct constantvector_addORsub_constantVector_op {
173173
/// @brief result[i] = vector1[i] * constant1 + vector2[i] * constant2
174174
///
175175
/// Input Parameters
176-
/// \param d : the type of computing device
177176
/// \param dim : array size
178177
/// \param vector1 : input array A
179178
/// \param constant1 : input constant a
@@ -182,7 +181,7 @@ struct constantvector_addORsub_constantVector_op {
182181
///
183182
/// Output Parameters
184183
/// \param result : output array
185-
void operator()(const Device *d, const int &dim, T *result, const T *vector1,
184+
void operator()(const int &dim, T *result, const T *vector1,
186185
const Real constant1, const T *vector2, const Real constant2);
187186
};
188187

@@ -372,7 +371,7 @@ template <typename T> struct vector_div_vector_op<T, base_device::DEVICE_GPU> {
372371
template <typename T>
373372
struct constantvector_addORsub_constantVector_op<T, base_device::DEVICE_GPU> {
374373
using Real = typename GetTypeReal<T>::type;
375-
void operator()(const base_device::DEVICE_GPU *d, const int &dim, T *result,
374+
void operator()(const int &dim, T *result,
376375
const T *vector1, const Real constant1, const T *vector2,
377376
const Real constant2);
378377
};

‎source/module_base/kernels/rocm/math_kernel_op.hip.cu‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,8 +567,7 @@ void vector_div_vector_op<std::complex<double>, base_device::DEVICE_GPU>::operat
567567

568568
// vector operator: result[i] = vector1[i] * constant1 + vector2[i] * constant2
569569
template <typename T>
570-
void constantvector_addORsub_constantVector_op<T, base_device::DEVICE_GPU>::operator()(const base_device::DEVICE_GPU* d,
571-
const int& dim,
570+
void constantvector_addORsub_constantVector_op<T, base_device::DEVICE_GPU>::operator()(const int& dim,
572571
T* result,
573572
const T* vector1,
574573
const Real constant1,

‎source/module_base/kernels/test/math_kernel_test.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,7 @@ TEST_F(TestModuleHsolverMathKernel, vector_div_vector_op_cpu)
297297
TEST_F(TestModuleHsolverMathKernel, constantvector_addORsub_constantVector_op_cpu)
298298
{
299299
std::vector<std::complex<double>> output(input.size());
300-
constantvector_addORsub_constantVector_op_cpu()(cpu_ctx,
301-
dim,
300+
constantvector_addORsub_constantVector_op_cpu()(dim,
302301
output.data(),
303302
input1.data(),
304303
constant1,
@@ -500,8 +499,7 @@ TEST_F(TestModuleHsolverMathKernel, constantvector_addORsub_constantVector_op_gp
500499
synchronize_memory_op()(input2_dev, input2.data(), input.size());
501500

502501
// run
503-
constantvector_addORsub_constantVector_op_gpu()(gpu_ctx,
504-
dim,
502+
constantvector_addORsub_constantVector_op_gpu()(dim,
505503
output_dev,
506504
input1_dev,
507505
constant1,

‎source/module_hsolver/diago_cg.cpp‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,7 @@ void DiagoCG<T, Device>::calc_grad(const ct::Tensor& prec,
247247
// grad.data<T>()[i] -= lambda * this->pphi[i];
248248
// }
249249
// haozhihan replace this 2022-10-6
250-
ModuleBase::constantvector_addORsub_constantVector_op<T, Device>()(ctx_,
251-
this->n_basis_,
250+
ModuleBase::constantvector_addORsub_constantVector_op<T, Device>()(this->n_basis_,
252251
grad.data<T>(),
253252
grad.data<T>(),
254253
1.0,
@@ -370,8 +369,7 @@ void DiagoCG<T, Device>::calc_gamma_cg(const int& iter,
370369
// pcg[i] = gamma * pcg[i] + grad.data<T>()[i];
371370
// }
372371
// haozhihan replace this 2022-10-6
373-
ModuleBase::constantvector_addORsub_constantVector_op<T, Device>()(ctx_,
374-
this->n_basis_,
372+
ModuleBase::constantvector_addORsub_constantVector_op<T, Device>()(this->n_basis_,
375373
cg.data<T>(),
376374
cg.data<T>(),
377375
gamma,
@@ -438,8 +436,7 @@ bool DiagoCG<T, Device>::update_psi(const ct::Tensor& pphi,
438436
// }
439437

440438
// haozhihan replace this 2022-10-6
441-
ModuleBase::constantvector_addORsub_constantVector_op<T, Device>()(ctx_,
442-
this->n_basis_,
439+
ModuleBase::constantvector_addORsub_constantVector_op<T, Device>()(this->n_basis_,
443440
phi_m.data<T>(),
444441
phi_m.data<T>(),
445442
cost,
@@ -460,15 +457,13 @@ bool DiagoCG<T, Device>::update_psi(const ct::Tensor& pphi,
460457
// }
461458

462459
// haozhihan replace this 2022-10-6
463-
ModuleBase::constantvector_addORsub_constantVector_op<T, Device>()(ctx_,
464-
this->n_basis_,
460+
ModuleBase::constantvector_addORsub_constantVector_op<T, Device>()(this->n_basis_,
465461
sphi.data<T>(),
466462
sphi.data<T>(),
467463
cost,
468464
scg.data<T>(),
469465
sint_norm);
470-
ModuleBase::constantvector_addORsub_constantVector_op<T, Device>()(ctx_,
471-
this->n_basis_,
466+
ModuleBase::constantvector_addORsub_constantVector_op<T, Device>()(this->n_basis_,
472467
hphi.data<T>(),
473468
hphi.data<T>(),
474469
cost,

‎source/module_hsolver/kernels/test/perf_math_kernel.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ BENCHMARK_DEFINE_F(PerfModuleHsolverMathKernel, BM_vector_div_vector_op_cpu)(ben
187187

188188
BENCHMARK_DEFINE_F(PerfModuleHsolverMathKernel, BM_constantvector_addORsub_constantVector_op_cpu)(benchmark::State& state) {
189189
for (auto _ : state) {
190-
constantvector_addORsub_constantVector_op_cpu()(cpu_ctx, dim_vector, result_zvector, test_zvector_a, dconstant_a ,test_zvector_b, dconstant_b);
190+
constantvector_addORsub_constantVector_op_cpu()(dim_vector, result_zvector, test_zvector_a, dconstant_a ,test_zvector_b, dconstant_b);
191191
}
192192
}
193193

@@ -256,7 +256,7 @@ BENCHMARK_DEFINE_F(PerfModuleHsolverMathKernel, BM_vector_div_vector_op_gpu)(ben
256256

257257
BENCHMARK_DEFINE_F(PerfModuleHsolverMathKernel, BM_constantvector_addORsub_constantVector_op_gpu)(benchmark::State& state) {
258258
for (auto _ : state) {
259-
constantvector_addORsub_constantVector_op_gpu()(gpu_ctx, dim_vector, result_zvector_gpu, test_zvector_a_gpu, dconstant_a ,test_zvector_b_gpu, dconstant_b);
259+
constantvector_addORsub_constantVector_op_gpu()(dim_vector, result_zvector_gpu, test_zvector_a_gpu, dconstant_a ,test_zvector_b_gpu, dconstant_b);
260260
}
261261
}
262262

0 commit comments

Comments
 (0)