Skip to content

Commit 50ebea3

Browse files
dyzhengdyzheng
committed
fix: update CMakeLists and includes for memory.h -> memory_recorder.h rename
- Replace all memory.cpp references with memory_recorder.cpp in CMakeLists.txt - Update all source files to include memory_recorder.h instead of memory.h - Add add_subdirectory(module_neighlist) to source_cell/CMakeLists.txt
1 parent 2715106 commit 50ebea3

17 files changed

Lines changed: 28 additions & 27 deletions

File tree

‎source/source_base/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ add_library(
3636
mathzone_add1.cpp
3737
matrix.cpp
3838
matrix3.cpp
39-
memory.cpp
39+
memory_recorder.cpp
4040
mymath.cpp
4141
opt_CG.cpp
4242
opt_DCsrch.cpp

‎source/source_base/global_function.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// USE FILE timer.h
1111
// ONLY : output time after quit.
1212
//==========================================================
13-
#include "memory.h"
13+
#include "memory_recorder.h"
1414
#include "timer.h"
1515

1616
#include <fstream>

‎source/source_base/test/CMakeLists.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ AddTest(
1818
AddTest(
1919
TARGET MODULE_BASE_tool_quit
2020
LIBS parameter
21-
SOURCES tool_quit_test.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../global_function.cpp ../memory.cpp ../timer.cpp
21+
SOURCES tool_quit_test.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../global_function.cpp ../memory_recorder.cpp ../timer.cpp
2222
)
2323
AddTest(
2424
TARGET MODULE_BASE_tool_check
2525
LIBS parameter
26-
SOURCES tool_check_test.cpp ../tool_check.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../global_function.cpp ../memory.cpp ../timer.cpp
26+
SOURCES tool_check_test.cpp ../tool_check.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../global_function.cpp ../memory_recorder.cpp ../timer.cpp
2727
)
2828
AddTest(
2929
TARGET MODULE_BASE_memory
30-
SOURCES memory_test.cpp ../memory.cpp ../parallel_reduce.cpp
30+
SOURCES memory_test.cpp ../memory_recorder.cpp ../parallel_reduce.cpp
3131
)
3232
ADDTest(
3333
TARGET MODULE_BASE_global_function
3434
LIBS parameter ${math_libs}
35-
SOURCES global_function_test.cpp ../global_function.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../memory.cpp ../timer.cpp
35+
SOURCES global_function_test.cpp ../global_function.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../memory_recorder.cpp ../timer.cpp
3636
)
3737
AddTest(
3838
TARGET MODULE_BASE_vector3
@@ -62,7 +62,7 @@ AddTest(
6262
AddTest(
6363
TARGET MODULE_BASE_complexarray
6464
LIBS parameter
65-
SOURCES complexarray_test.cpp ../complexarray.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../global_function.cpp ../memory.cpp ../timer.cpp
65+
SOURCES complexarray_test.cpp ../complexarray.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../global_function.cpp ../memory_recorder.cpp ../timer.cpp
6666
)
6767
AddTest(
6868
TARGET MODULE_BASE_complexmatrix
@@ -77,7 +77,7 @@ AddTest(
7777
AddTest(
7878
TARGET MODULE_BASE_sph_bessel_recursive
7979
LIBS parameter
80-
SOURCES sph_bessel_recursive_test.cpp ../sph_bessel_recursive-d1.cpp ../sph_bessel_recursive-d2.cpp ../memory.cpp ../global_variable.cpp
80+
SOURCES sph_bessel_recursive_test.cpp ../sph_bessel_recursive-d1.cpp ../sph_bessel_recursive-d2.cpp ../memory_recorder.cpp ../global_variable.cpp
8181
)
8282
AddTest(
8383
TARGET MODULE_BASE_ylmreal
@@ -157,19 +157,19 @@ AddTest(
157157
AddTest(
158158
TARGET MODULE_BASE_ylm
159159
LIBS parameter
160-
SOURCES ylm_test.cpp ../ylm.cpp ../timer.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../global_function.cpp ../memory.cpp
160+
SOURCES ylm_test.cpp ../ylm.cpp ../timer.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../global_function.cpp ../memory_recorder.cpp
161161
)
162162

163163
AddTest(
164164
TARGET MODULE_BASE_global_file
165165
LIBS parameter
166-
SOURCES global_file_test.cpp ../global_file.cpp ../global_function.cpp ../tool_quit.cpp ../global_variable.cpp ../memory.cpp ../timer.cpp
166+
SOURCES global_file_test.cpp ../global_file.cpp ../global_function.cpp ../tool_quit.cpp ../global_variable.cpp ../memory_recorder.cpp ../timer.cpp
167167
)
168168

169169
AddTest(
170170
TARGET MODULE_BASE_tool_title
171171
LIBS parameter
172-
SOURCES tool_title_test.cpp ../tool_title.cpp ../global_variable.cpp ../global_function.cpp ../timer.cpp ../tool_quit.cpp ../global_file.cpp ../memory.cpp
172+
SOURCES tool_title_test.cpp ../tool_title.cpp ../global_variable.cpp ../global_function.cpp ../timer.cpp ../tool_quit.cpp ../global_file.cpp ../memory_recorder.cpp
173173
)
174174

175175
AddTest(

‎source/source_base/test/memory_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace GlobalV
2626
*/
2727

2828
#define private public
29-
#include "../memory.h"
29+
#include "../memory_recorder.h"
3030
#undef private
3131

3232
class MemoryTest : public testing::Test

‎source/source_base/test_parallel/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ AddTest(
77
AddTest(
88
TARGET MODULE_BASE_ParaGlobal
99
LIBS parameter MPI::MPI_CXX
10-
SOURCES parallel_global_test.cpp ../global_variable.cpp ../parallel_global.cpp ../parallel_comm.cpp ../tool_quit.cpp ../global_file.cpp ../global_function.cpp ../memory.cpp ../timer.cpp ../parallel_reduce.cpp
10+
SOURCES parallel_global_test.cpp ../global_variable.cpp ../parallel_global.cpp ../parallel_comm.cpp ../tool_quit.cpp ../global_file.cpp ../global_function.cpp ../memory_recorder.cpp ../timer.cpp ../parallel_reduce.cpp
1111
)
1212

1313
AddTest(
1414
TARGET MODULE_BASE_ParaReduce
1515
LIBS parameter MPI::MPI_CXX
16-
SOURCES parallel_reduce_test.cpp ../global_variable.cpp ../parallel_global.cpp ../parallel_comm.cpp ../parallel_common.cpp ../parallel_reduce.cpp ../tool_quit.cpp ../global_file.cpp ../global_function.cpp ../memory.cpp ../timer.cpp
16+
SOURCES parallel_reduce_test.cpp ../global_variable.cpp ../parallel_global.cpp ../parallel_comm.cpp ../parallel_common.cpp ../parallel_reduce.cpp ../tool_quit.cpp ../global_file.cpp ../global_function.cpp ../memory_recorder.cpp ../timer.cpp
1717
)
1818

1919
install(FILES parallel_common_test.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

‎source/source_base/tool_quit.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "source_io/module_parameter/parameter.h"
1111
#include "global_file.h"
1212
#include "timer.h"
13-
#include "memory.h"
13+
#include "memory_recorder.h"
1414
#endif
1515

1616
namespace ModuleBase

‎source/source_basis/module_ao/test/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ list(APPEND depend_files
66
../../../source_base/math_polyint.cpp
77
../../../source_base/math_ylmreal.cpp
88
../../../source_base/ylm.cpp
9-
../../../source_base/memory.cpp
9+
../../../source_base/memory_recorder.cpp
1010
../../../source_base/module_external/blas_connector_base.cpp
1111
../../../source_base/module_external/blas_connector_vector.cpp
1212
../../../source_base/module_external/blas_connector_matrix.cpp

‎source/source_basis/module_pw/kernels/test/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ AddTest(
77
../../../../source_base/tool_quit.cpp ../../../../source_base/global_variable.cpp
88
../../../../source_base/parallel_global.cpp ../../../../source_base/parallel_reduce.cpp
99
../../../../source_base/parallel_comm.cpp
10-
../../../../source_base/complexmatrix.cpp ../../../../source_base/matrix.cpp ../../../../source_base/memory.cpp
10+
../../../../source_base/complexmatrix.cpp ../../../../source_base/matrix.cpp ../../../../source_base/memory_recorder.cpp
1111
../../../../source_base/libm/branred.cpp ../../../../source_base/libm/sincos.cpp
1212
../../../../source_base/module_external/blas_connector_base.cpp ../../../../source_base/module_external/blas_connector_vector.cpp ../../../../source_base/module_external/blas_connector_matrix.cpp
1313
)

‎source/source_basis/module_pw/test/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ AddTest(
33
TARGET MODULE_PW_pw_test
44
LIBS parameter ${math_libs} planewave device
55
SOURCES ../../../source_base/matrix.cpp ../../../source_base/complexmatrix.cpp ../../../source_base/matrix3.cpp ../../../source_base/tool_quit.cpp
6-
../../../source_base/mymath.cpp ../../../source_base/timer.cpp ../../../source_base/memory.cpp
6+
../../../source_base/mymath.cpp ../../../source_base/timer.cpp ../../../source_base/memory_recorder.cpp
77
../../../source_base/module_external/blas_connector_base.cpp ../../../source_base/module_external/blas_connector_vector.cpp ../../../source_base/module_external/blas_connector_matrix.cpp
88
../../../source_base/libm/branred.cpp ../../../source_base/libm/sincos.cpp
99
../../../source_base/module_device/memory_op.cpp

‎source/source_cell/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
add_subdirectory(module_symmetry)
22
add_subdirectory(module_neighbor)
3+
add_subdirectory(module_neighlist)
34

45
add_library(
56
cell

0 commit comments

Comments
 (0)