Skip to content

Commit f310a90

Browse files
Critsium-xyCritsium-xy
committed
Fix module_base tests
1 parent 3c86d0b commit f310a90

File tree

6 files changed

+19
-61
lines changed

6 files changed

+19
-61
lines changed

‎source/module_base/blas_connector.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#ifndef BLAS_CONNECTOR_CPP
2-
#define BLAS_CONNECTOR_CPP
31
#include "blas_connector.h"
42

53
#ifdef __DSP
@@ -533,6 +531,4 @@ void BlasConnector::copy(const long n, const std::complex<double> *a, const int
533531
if (device_type == base_device::AbacusDevice_t::CpuDevice) {
534532
zcopy_(&n, a, &incx, b, &incy);
535533
}
536-
}
537-
538-
#endif
534+
}

‎source/module_base/test/CMakeLists.txt

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ install(DIRECTORY data DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
33
AddTest(
44
TARGET base_blas_connector
55
LIBS parameter ${math_libs} base device
6-
SOURCES blas_connector_test.cpp ../blas_connector.cpp
6+
SOURCES blas_connector_test.cpp
77
)
88
AddTest(
99
TARGET base_atom_in
@@ -32,7 +32,7 @@ AddTest(
3232
ADDTest(
3333
TARGET base_global_function
3434
LIBS parameter ${math_libs} base device
35-
SOURCES global_function_test.cpp ../blas_connector.cpp ../global_function.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../memory.cpp ../timer.cpp
35+
SOURCES global_function_test.cpp
3636
)
3737
AddTest(
3838
TARGET base_vector3
@@ -42,7 +42,7 @@ AddTest(
4242
AddTest(
4343
TARGET base_matrix3
4444
LIBS parameter ${math_libs} base device
45-
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
45+
SOURCES matrix3_test.cpp
4646
)
4747
AddTest(
4848
TARGET base_intarray
@@ -57,7 +57,7 @@ AddTest(
5757
AddTest(
5858
TARGET base_matrix
5959
LIBS parameter ${math_libs} base device
60-
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
60+
SOURCES matrix_test.cpp
6161
)
6262
AddTest(
6363
TARGET base_complexarray
@@ -67,7 +67,7 @@ AddTest(
6767
AddTest(
6868
TARGET base_complexmatrix
6969
LIBS parameter ${math_libs} base device
70-
SOURCES complexmatrix_test.cpp ../blas_connector.cpp ../complexmatrix.cpp ../matrix.cpp
70+
SOURCES complexmatrix_test.cpp
7171
)
7272
AddTest(
7373
TARGET base_integral
@@ -82,9 +82,7 @@ AddTest(
8282
AddTest(
8383
TARGET base_ylmreal
8484
LIBS parameter ${math_libs} base device
85-
SOURCES math_ylmreal_test.cpp ../blas_connector.cpp ../math_ylmreal.cpp ../complexmatrix.cpp ../global_variable.cpp ../ylm.cpp ../realarray.cpp ../timer.cpp ../matrix.cpp ../vector3.h
86-
../parallel_reduce.cpp ../parallel_global.cpp ../parallel_comm.cpp ../parallel_common.cpp
87-
../memory.cpp ../libm/branred.cpp ../libm/sincos.cpp
85+
SOURCES math_ylmreal_test.cpp ../libm/branred.cpp ../libm/sincos.cpp
8886
)
8987
AddTest(
9088
TARGET base_math_sphbes
@@ -94,12 +92,12 @@ AddTest(
9492
AddTest(
9593
TARGET base_mathzone
9694
LIBS parameter ${math_libs} base device
97-
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
95+
SOURCES mathzone_test.cpp
9896
)
9997
AddTest(
10098
TARGET base_mathzone_add1
10199
LIBS parameter ${math_libs} base device
102-
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
100+
SOURCES mathzone_add1_test.cpp
103101
)
104102
AddTest(
105103
TARGET base_math_polyint
@@ -109,7 +107,7 @@ AddTest(
109107
AddTest(
110108
TARGET base_gram_schmidt_orth
111109
LIBS parameter ${math_libs} base device
112-
SOURCES gram_schmidt_orth_test.cpp ../blas_connector.cpp ../gram_schmidt_orth.h ../gram_schmidt_orth-inl.h ../global_function.h ../math_integral.cpp
110+
SOURCES gram_schmidt_orth_test.cpp
113111
)
114112
AddTest(
115113
TARGET base_math_bspline
@@ -119,7 +117,7 @@ AddTest(
119117
AddTest(
120118
TARGET base_inverse_matrix
121119
LIBS parameter ${math_libs} base device
122-
SOURCES inverse_matrix_test.cpp ../blas_connector.cpp ../inverse_matrix.cpp ../complexmatrix.cpp ../matrix.cpp ../timer.cpp
120+
SOURCES inverse_matrix_test.cpp
123121
)
124122
AddTest(
125123
TARGET base_mymath
@@ -135,25 +133,25 @@ AddTest(
135133
AddTest(
136134
TARGET base_math_chebyshev
137135
LIBS parameter ${math_libs} base device container
138-
SOURCES math_chebyshev_test.cpp ../blas_connector.cpp ../math_chebyshev.cpp ../tool_quit.cpp ../global_variable.cpp ../timer.cpp ../global_file.cpp ../global_function.cpp ../memory.cpp ../parallel_reduce.cpp
136+
SOURCES math_chebyshev_test.cpp
139137
)
140138

141139
AddTest(
142140
TARGET base_lapack_connector
143141
LIBS parameter ${math_libs} base device
144-
SOURCES lapack_connector_test.cpp ../blas_connector.cpp ../lapack_connector.h
142+
SOURCES lapack_connector_test.cpp
145143
)
146144

147145
AddTest(
148146
TARGET base_opt_CG
149147
LIBS parameter ${math_libs} base device
150-
SOURCES opt_CG_test.cpp opt_test_tools.cpp ../blas_connector.cpp ../opt_CG.cpp ../opt_DCsrch.cpp ../global_variable.cpp ../parallel_reduce.cpp
148+
SOURCES opt_CG_test.cpp opt_test_tools.cpp
151149
)
152150

153151
AddTest(
154152
TARGET base_opt_TN
155153
LIBS parameter ${math_libs} base device
156-
SOURCES opt_TN_test.cpp opt_test_tools.cpp ../blas_connector.cpp ../opt_CG.cpp ../opt_DCsrch.cpp ../global_variable.cpp ../parallel_reduce.cpp
154+
SOURCES opt_TN_test.cpp opt_test_tools.cpp
157155
)
158156

159157
AddTest(
@@ -194,27 +192,25 @@ AddTest(
194192

195193
AddTest(
196194
TARGET spherical_bessel_transformer
197-
SOURCES spherical_bessel_transformer_test.cpp ../blas_connector.cpp ../spherical_bessel_transformer.cpp ../math_sphbes.cpp ../math_integral.cpp ../timer.cpp
195+
SOURCES spherical_bessel_transformer_test.cpp
198196
LIBS parameter ${math_libs} base device
199197
)
200198

201199
AddTest(
202200
TARGET cubic_spline
203-
SOURCES cubic_spline_test.cpp ../blas_connector.cpp ../cubic_spline.cpp
201+
SOURCES cubic_spline_test.cpp
204202
LIBS parameter ${math_libs} base device
205203
)
206204

207205
AddTest(
208206
TARGET clebsch_gordan_coeff_test
209-
SOURCES clebsch_gordan_coeff_test.cpp ../blas_connector.cpp ../clebsch_gordan_coeff.cpp ../intarray.cpp ../realarray.cpp ../complexmatrix.cpp ../matrix.cpp ../timer.cpp
210-
../math_ylmreal.cpp ../global_variable.cpp ../ylm.cpp ../timer.cpp ../vector3.h ../parallel_reduce.cpp ../parallel_global.cpp ../parallel_comm.cpp ../parallel_common.cpp
211-
../memory.cpp ../libm/branred.cpp ../libm/sincos.cpp ../inverse_matrix.cpp ../lapack_connector.h
207+
SOURCES clebsch_gordan_coeff_test.cpp
212208
LIBS parameter ${math_libs} base device
213209
)
214210

215211
AddTest(
216212
TARGET assoc_laguerre_test
217-
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
213+
SOURCES assoc_laguerre_test.cpp
218214
LIBS parameter ${math_libs} base device
219215
)
220216

‎source/module_base/test/clebsch_gordan_coeff_test.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,6 @@
1616
* - functions: gen_rndm_r and compute_ap
1717
*/
1818

19-
namespace ModuleBase
20-
{
21-
void WARNING_QUIT(const std::string& file, const std::string& description)
22-
{
23-
return;
24-
}
25-
void WARNING(const std::string& file, const std::string& description)
26-
{
27-
return;
28-
}
29-
} // namespace ModuleBase
30-
3119
TEST(ClebschGordanTest, ClebschGordanExit)
3220
{
3321
int lmaxkb = -2;

‎source/module_base/test/complexmatrix_test.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@
3838
*
3939
*/
4040

41-
//a mock function of WARNING_QUIT, to avoid the uncorrected call by matrix.cpp at line 37.
42-
namespace ModuleBase
43-
{
44-
void WARNING_QUIT(const std::string &file,const std::string &description) {exit(1);}
45-
}
46-
4741
inline void EXPECT_COMPLEX_EQ(const std::complex<double>& a,const std::complex<double>& b)
4842
{
4943
EXPECT_DOUBLE_EQ(a.real(),b.real());

‎source/module_base/test/inverse_matrix_test.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616
* - computes the inverse of a dim*dim real matrix
1717
*/
1818

19-
//a mock function of WARNING_QUIT, to avoid the uncorrected call by matrix.cpp at line 37.
20-
namespace ModuleBase
21-
{
22-
void WARNING_QUIT(const std::string &file,const std::string &description) {exit(1);}
23-
}
24-
2519
TEST(InverseMatrixComplexTest, InverseMatrixComplex)
2620
{
2721
int dim = 10;

‎source/module_base/test/math_ylmreal_test.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,6 @@
3636
*
3737
*/
3838

39-
40-
41-
//mock functions of WARNING_QUIT and WARNING
42-
namespace ModuleBase
43-
{
44-
void WARNING_QUIT(const std::string &file,const std::string &description) {exit(1);}
45-
void WARNING(const std::string &file,const std::string &description) {return ;}
46-
}
47-
48-
4939
class YlmRealTest : public testing::Test
5040
{
5141
protected:

0 commit comments

Comments
 (0)