Skip to content

Commit 5198e2d

Browse files
Critsium-xyCritsium-xy
committed
Modify CMakeLists
1 parent 3e7ca1a commit 5198e2d

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

‎source/module_base/blas_connector.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ void BlasConnector::gemm(const char transa, const char transb, const int m, cons
204204
#endif
205205
else if (device_type == base_device::AbacusDevice_t::GpuDevice){
206206
#ifdef __CUDA
207-
cublasOperation_t cutransA = judge_trans(false, transa, "gemm_op");
208-
cublasOperation_t cutransB = judge_trans(false, transb, "gemm_op");
207+
cublasOperation_t cutransA = BlasUtils::judge_trans(false, transa, "gemm_op");
208+
cublasOperation_t cutransB = BlasUtils::judge_trans(false, transb, "gemm_op");
209209
cublasErrcheck(cublasSgemm(BlasUtils::cublas_handle, cutransA, cutransB, n, m, k, &alpha, b, ldb, a, lda, &beta, c, ldc));
210210
#endif
211211
}
@@ -229,8 +229,8 @@ void BlasConnector::gemm(const char transa, const char transb, const int m, cons
229229
#endif
230230
else if (device_type == base_device::AbacusDevice_t::GpuDevice){
231231
#ifdef __CUDA
232-
cublasOperation_t cutransA = judge_trans(false, transa, "gemm_op");
233-
cublasOperation_t cutransB = judge_trans(false, transb, "gemm_op");
232+
cublasOperation_t cutransA = BlasUtils::judge_trans(false, transa, "gemm_op");
233+
cublasOperation_t cutransB = BlasUtils::judge_trans(false, transb, "gemm_op");
234234
cublasErrcheck(cublasDgemm(BlasUtils::cublas_handle, cutransA, cutransB, n, m, k, &alpha, b, ldb, a, lda, &beta, c, ldc));
235235
#endif
236236
}
@@ -254,8 +254,8 @@ void BlasConnector::gemm(const char transa, const char transb, const int m, cons
254254
#endif
255255
else if (device_type == base_device::AbacusDevice_t::GpuDevice){
256256
#ifdef __CUDA
257-
cublasOperation_t cutransA = judge_trans(false, transa, "gemm_op");
258-
cublasOperation_t cutransB = judge_trans(false, transb, "gemm_op");
257+
cublasOperation_t cutransA = BlasUtils::judge_trans(false, transa, "gemm_op");
258+
cublasOperation_t cutransB = BlasUtils::judge_trans(false, transb, "gemm_op");
259259
cublasErrcheck(cublasCgemm(BlasUtils::cublas_handle, cutransA, cutransB, n, m, k, (float2*)&alpha, (float2*)b, ldb, (float2*)a, lda, (float2*)&beta, (float2*)c, ldc));
260260
#endif
261261
}
@@ -279,8 +279,8 @@ void BlasConnector::gemm(const char transa, const char transb, const int m, cons
279279
#endif
280280
else if (device_type == base_device::AbacusDevice_t::GpuDevice){
281281
#ifdef __CUDA
282-
cublasOperation_t cutransA = judge_trans(false, transa, "gemm_op");
283-
cublasOperation_t cutransB = judge_trans(false, transb, "gemm_op");
282+
cublasOperation_t cutransA = BlasUtils::judge_trans(false, transa, "gemm_op");
283+
cublasOperation_t cutransB = BlasUtils::judge_trans(false, transb, "gemm_op");
284284
cublasErrcheck(cublasZgemm(BlasUtils::cublas_handle, cutransA, cutransB, n, m, k, (double2*)&alpha, (double2*)b, ldb, (double2*)a, lda, (double2*)&beta, (double2*)c, ldc));
285285
#endif
286286
}
@@ -305,8 +305,8 @@ void BlasConnector::gemm_cm(const char transa, const char transb, const int m, c
305305
#endif
306306
else if (device_type == base_device::AbacusDevice_t::GpuDevice){
307307
#ifdef __CUDA
308-
cublasOperation_t cutransA = judge_trans(false, transa, "gemm_op");
309-
cublasOperation_t cutransB = judge_trans(false, transb, "gemm_op");
308+
cublasOperation_t cutransA = BlasUtils::judge_trans(false, transa, "gemm_op");
309+
cublasOperation_t cutransB = BlasUtils::judge_trans(false, transb, "gemm_op");
310310
cublasErrcheck(cublasSgemm(BlasUtils::cublas_handle, cutransA, cutransB, m, n, k, &alpha, a, lda, b, ldb, &beta, c, ldc));
311311
#endif
312312
}
@@ -330,8 +330,8 @@ void BlasConnector::gemm_cm(const char transa, const char transb, const int m, c
330330
#endif
331331
else if (device_type == base_device::AbacusDevice_t::GpuDevice){
332332
#ifdef __CUDA
333-
cublasOperation_t cutransA = judge_trans(false, transa, "gemm_op");
334-
cublasOperation_t cutransB = judge_trans(false, transb, "gemm_op");
333+
cublasOperation_t cutransA = BlasUtils::judge_trans(false, transa, "gemm_op");
334+
cublasOperation_t cutransB = BlasUtils::judge_trans(false, transb, "gemm_op");
335335
cublasErrcheck(cublasDgemm(BlasUtils::cublas_handle, cutransA, cutransB, m, n, k, &alpha, a, lda, b, ldb, &beta, c, ldc));
336336
#endif
337337
}
@@ -355,8 +355,8 @@ void BlasConnector::gemm_cm(const char transa, const char transb, const int m, c
355355
#endif
356356
else if (device_type == base_device::AbacusDevice_t::GpuDevice){
357357
#ifdef __CUDA
358-
cublasOperation_t cutransA = judge_trans(false, transa, "gemm_op");
359-
cublasOperation_t cutransB = judge_trans(false, transb, "gemm_op");
358+
cublasOperation_t cutransA = BlasUtils::judge_trans(false, transa, "gemm_op");
359+
cublasOperation_t cutransB = BlasUtils::judge_trans(false, transb, "gemm_op");
360360
cublasErrcheck(cublasCgemm(BlasUtils::cublas_handle, cutransA, cutransB, m, n, k, (float2*)&alpha, (float2*)a, lda, (float2*)b, ldb, (float2*)&beta, (float2*)c, ldc));
361361
#endif
362362
}
@@ -380,8 +380,8 @@ void BlasConnector::gemm_cm(const char transa, const char transb, const int m, c
380380
#endif
381381
else if (device_type == base_device::AbacusDevice_t::GpuDevice){
382382
#ifdef __CUDA
383-
cublasOperation_t cutransA = judge_trans(false, transa, "gemm_op");
384-
cublasOperation_t cutransB = judge_trans(false, transb, "gemm_op");
383+
cublasOperation_t cutransA = BlasUtils::judge_trans(false, transa, "gemm_op");
384+
cublasOperation_t cutransB = BlasUtils::judge_trans(false, transb, "gemm_op");
385385
cublasErrcheck(cublasZgemm(BlasUtils::cublas_handle, cutransA, cutransB, m, n, k, (double2*)&alpha, (double2*)a, lda, (double2*)b, ldb, (double2*)&beta, (double2*)c, ldc));
386386
#endif
387387
}

‎source/module_base/test/CMakeLists.txt‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ remove_definitions(-D__MPI)
22
install(DIRECTORY data DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
33
AddTest(
44
TARGET base_blas_connector
5-
LIBS parameter ${math_libs}
5+
LIBS parameter ${math_libs} base device
66
SOURCES blas_connector_test.cpp ../blas_connector.cpp
77
)
88
AddTest(
@@ -31,7 +31,7 @@ AddTest(
3131
)
3232
ADDTest(
3333
TARGET base_global_function
34-
LIBS parameter ${math_libs}
34+
LIBS parameter ${math_libs} base device
3535
SOURCES global_function_test.cpp ../blas_connector.cpp ../global_function.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../memory.cpp ../timer.cpp
3636
)
3737
AddTest(
@@ -41,7 +41,7 @@ AddTest(
4141
)
4242
AddTest(
4343
TARGET base_matrix3
44-
LIBS parameter ${math_libs}
44+
LIBS parameter ${math_libs} base device
4545
SOURCES matrix3_test.cpp ../matrix3.cpp ../matrix.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../global_function.cpp ../memory.cpp ../timer.cpp ../blas_connector.cpp
4646
)
4747
AddTest(
@@ -56,7 +56,7 @@ AddTest(
5656
)
5757
AddTest(
5858
TARGET base_matrix
59-
LIBS parameter ${math_libs}
59+
LIBS parameter ${math_libs} base device
6060
SOURCES matrix_test.cpp ../blas_connector.cpp ../matrix.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../global_function.cpp ../memory.cpp ../timer.cpp
6161
)
6262
AddTest(
@@ -66,7 +66,7 @@ AddTest(
6666
)
6767
AddTest(
6868
TARGET base_complexmatrix
69-
LIBS parameter ${math_libs}
69+
LIBS parameter ${math_libs} base device
7070
SOURCES complexmatrix_test.cpp ../blas_connector.cpp ../complexmatrix.cpp ../matrix.cpp
7171
)
7272
AddTest(
@@ -93,12 +93,12 @@ AddTest(
9393
)
9494
AddTest(
9595
TARGET base_mathzone
96-
LIBS parameter ${math_libs}
96+
LIBS parameter ${math_libs} base device
9797
SOURCES mathzone_test.cpp ../matrix3.cpp ../matrix.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../global_function.cpp ../memory.cpp ../timer.cpp ../blas_connector.cpp
9898
)
9999
AddTest(
100100
TARGET base_mathzone_add1
101-
LIBS parameter ${math_libs}
101+
LIBS parameter ${math_libs} base device
102102
SOURCES mathzone_add1_test.cpp ../blas_connector.cpp ../mathzone_add1.cpp ../math_sphbes.cpp ../matrix3.cpp ../matrix.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../global_function.cpp ../memory.cpp ../timer.cpp
103103
)
104104
AddTest(
@@ -108,7 +108,7 @@ AddTest(
108108
)
109109
AddTest(
110110
TARGET base_gram_schmidt_orth
111-
LIBS parameter ${math_libs}
111+
LIBS parameter ${math_libs} base device
112112
SOURCES gram_schmidt_orth_test.cpp ../blas_connector.cpp ../gram_schmidt_orth.h ../gram_schmidt_orth-inl.h ../global_function.h ../math_integral.cpp
113113
)
114114
AddTest(
@@ -118,7 +118,7 @@ AddTest(
118118
)
119119
AddTest(
120120
TARGET base_inverse_matrix
121-
LIBS parameter ${math_libs}
121+
LIBS parameter ${math_libs} device
122122
SOURCES inverse_matrix_test.cpp ../blas_connector.cpp ../inverse_matrix.cpp ../complexmatrix.cpp ../matrix.cpp ../timer.cpp
123123
)
124124
AddTest(
@@ -140,19 +140,19 @@ AddTest(
140140

141141
AddTest(
142142
TARGET base_lapack_connector
143-
LIBS parameter ${math_libs}
143+
LIBS parameter ${math_libs} base device
144144
SOURCES lapack_connector_test.cpp ../blas_connector.cpp ../lapack_connector.h
145145
)
146146

147147
AddTest(
148148
TARGET base_opt_CG
149-
LIBS parameter ${math_libs}
149+
LIBS parameter ${math_libs} base device
150150
SOURCES opt_CG_test.cpp opt_test_tools.cpp ../blas_connector.cpp ../opt_CG.cpp ../opt_DCsrch.cpp ../global_variable.cpp ../parallel_reduce.cpp
151151
)
152152

153153
AddTest(
154154
TARGET base_opt_TN
155-
LIBS parameter ${math_libs}
155+
LIBS parameter ${math_libs} base device
156156
SOURCES opt_TN_test.cpp opt_test_tools.cpp ../blas_connector.cpp ../opt_CG.cpp ../opt_DCsrch.cpp ../global_variable.cpp ../parallel_reduce.cpp
157157
)
158158

@@ -195,13 +195,13 @@ AddTest(
195195
AddTest(
196196
TARGET spherical_bessel_transformer
197197
SOURCES spherical_bessel_transformer_test.cpp ../blas_connector.cpp ../spherical_bessel_transformer.cpp ../math_sphbes.cpp ../math_integral.cpp ../timer.cpp
198-
LIBS parameter ${math_libs}
198+
LIBS parameter ${math_libs} base device
199199
)
200200

201201
AddTest(
202202
TARGET cubic_spline
203203
SOURCES cubic_spline_test.cpp ../blas_connector.cpp ../cubic_spline.cpp
204-
LIBS parameter ${math_libs}
204+
LIBS parameter ${math_libs} base device
205205
)
206206

207207
AddTest(
@@ -215,7 +215,7 @@ AddTest(
215215
AddTest(
216216
TARGET assoc_laguerre_test
217217
SOURCES assoc_laguerre_test.cpp ../blas_connector.cpp ../assoc_laguerre.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../global_function.cpp ../memory.cpp ../timer.cpp
218-
LIBS parameter ${math_libs}
218+
LIBS parameter ${math_libs} base device
219219
)
220220

221221
AddTest(

0 commit comments

Comments
 (0)