Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/source_base/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ add_library(
mathzone_add1.cpp
matrix.cpp
matrix3.cpp
memory.cpp
memory_recorder.cpp
mymath.cpp
opt_CG.cpp
opt_DCsrch.cpp
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
//==========================================================
// AUTHOR : mohan
// DATE : 2008-11-18
//==========================================================
#include <cassert>
#include "memory.h"
#include "memory_recorder.h"
#include "global_variable.h"
#include "source_base/parallel_reduce.h"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef MEMORY_H
#define MEMORY_H
#ifndef RECORD_MEMORY_H
#define RECORD_MEMORY_H

#include <fstream>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion source/source_base/module_device/cuda/memory_op.cu
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "source_base/module_device/memory_op.h"
#include "source_base/memory.h"
#include "source_base/memory_recorder.h"

#include <base/macros/macros.h>
#include <cuda_runtime.h>
Expand Down
2 changes: 1 addition & 1 deletion source/source_base/module_device/memory_op.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "memory_op.h"

#include "source_base/memory.h"
#include "source_base/memory_recorder.h"
#include "source_base/tool_threading.h"
#ifdef __DSP
#include "source_base/kernels/dsp/dsp_connector.h"
Expand Down
1 change: 0 additions & 1 deletion source/source_base/module_mixing/broyden_mixing.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include "broyden_mixing.h"

#include "source_base/module_external/lapack_connector.h"
#include "source_base/memory.h"
#include "source_base/module_container/base/third_party/blas.h"
#include "source_base/timer.h"
#include "source_base/tool_title.h"
Expand Down
1 change: 0 additions & 1 deletion source/source_base/module_mixing/plain_mixing.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include "plain_mixing.h"

#include "source_base/memory.h"
#include "source_base/timer.h"
#include "source_base/tool_title.h"
namespace Base_Mixing
Expand Down
1 change: 0 additions & 1 deletion source/source_base/module_mixing/pulay_mixing.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include "pulay_mixing.h"

#include "source_base/module_external/lapack_connector.h"
#include "source_base/memory.h"
#include "source_base/timer.h"
#include "source_base/tool_title.h"
namespace Base_Mixing
Expand Down
2 changes: 1 addition & 1 deletion source/source_base/sph_bessel_recursive-d2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "sph_bessel_recursive.h"
#include "constants.h"
#include "source_base/memory.h"
#include "source_base/memory_recorder.h"

#include<cmath>
#include<stdexcept>
Expand Down
18 changes: 9 additions & 9 deletions source/source_base/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ AddTest(
AddTest(
TARGET MODULE_BASE_tool_quit
LIBS parameter
SOURCES tool_quit_test.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../global_function.cpp ../memory.cpp ../timer.cpp
SOURCES tool_quit_test.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../global_function.cpp ../memory_recorder.cpp ../timer.cpp
)
AddTest(
TARGET MODULE_BASE_tool_check
LIBS parameter
SOURCES tool_check_test.cpp ../tool_check.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../global_function.cpp ../memory.cpp ../timer.cpp
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
)
AddTest(
TARGET MODULE_BASE_memory
SOURCES memory_test.cpp ../memory.cpp ../parallel_reduce.cpp
SOURCES memory_test.cpp ../memory_recorder.cpp ../parallel_reduce.cpp
)
ADDTest(
TARGET MODULE_BASE_global_function
LIBS parameter ${math_libs}
SOURCES global_function_test.cpp ../global_function.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../memory.cpp ../timer.cpp
SOURCES global_function_test.cpp ../global_function.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../memory_recorder.cpp ../timer.cpp
)
AddTest(
TARGET MODULE_BASE_vector3
Expand Down Expand Up @@ -62,7 +62,7 @@ AddTest(
AddTest(
TARGET MODULE_BASE_complexarray
LIBS parameter
SOURCES complexarray_test.cpp ../complexarray.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../global_function.cpp ../memory.cpp ../timer.cpp
SOURCES complexarray_test.cpp ../complexarray.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../global_function.cpp ../memory_recorder.cpp ../timer.cpp
)
AddTest(
TARGET MODULE_BASE_complexmatrix
Expand All @@ -77,7 +77,7 @@ AddTest(
AddTest(
TARGET MODULE_BASE_sph_bessel_recursive
LIBS parameter
SOURCES sph_bessel_recursive_test.cpp ../sph_bessel_recursive-d1.cpp ../sph_bessel_recursive-d2.cpp ../memory.cpp ../global_variable.cpp
SOURCES sph_bessel_recursive_test.cpp ../sph_bessel_recursive-d1.cpp ../sph_bessel_recursive-d2.cpp ../memory_recorder.cpp ../global_variable.cpp
)
AddTest(
TARGET MODULE_BASE_ylmreal
Expand Down Expand Up @@ -157,19 +157,19 @@ AddTest(
AddTest(
TARGET MODULE_BASE_ylm
LIBS parameter
SOURCES ylm_test.cpp ../ylm.cpp ../timer.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../global_function.cpp ../memory.cpp
SOURCES ylm_test.cpp ../ylm.cpp ../timer.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../global_function.cpp ../memory_recorder.cpp
)

AddTest(
TARGET MODULE_BASE_global_file
LIBS parameter
SOURCES global_file_test.cpp ../global_file.cpp ../global_function.cpp ../tool_quit.cpp ../global_variable.cpp ../memory.cpp ../timer.cpp
SOURCES global_file_test.cpp ../global_file.cpp ../global_function.cpp ../tool_quit.cpp ../global_variable.cpp ../memory_recorder.cpp ../timer.cpp
)

AddTest(
TARGET MODULE_BASE_tool_title
LIBS parameter
SOURCES tool_title_test.cpp ../tool_title.cpp ../global_variable.cpp ../global_function.cpp ../timer.cpp ../tool_quit.cpp ../global_file.cpp ../memory.cpp
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
)

AddTest(
Expand Down
2 changes: 1 addition & 1 deletion source/source_base/test/memory_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace GlobalV
*/

#define private public
#include "../memory.h"
#include "../memory_recorder.h"
#undef private

class MemoryTest : public testing::Test
Expand Down
4 changes: 2 additions & 2 deletions source/source_base/test_parallel/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ AddTest(
AddTest(
TARGET MODULE_BASE_ParaGlobal
LIBS parameter MPI::MPI_CXX
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
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
)

AddTest(
TARGET MODULE_BASE_ParaReduce
LIBS parameter MPI::MPI_CXX
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
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
)

install(FILES parallel_common_test.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
Expand Down
2 changes: 1 addition & 1 deletion source/source_basis/module_ao/ORB_gaunt_table.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include <cassert>
#include "ORB_gaunt_table.h"
#include "source_base/timer.h"
#include "source_base/memory.h"
#include "source_base/memory_recorder.h"
#include "source_base/mathzone.h"
#include "source_base/global_function.h"
#include "source_base/vector3.h"
Expand Down
2 changes: 1 addition & 1 deletion source/source_basis/module_ao/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ list(APPEND depend_files
../../../source_base/math_polyint.cpp
../../../source_base/math_ylmreal.cpp
../../../source_base/ylm.cpp
../../../source_base/memory.cpp
../../../source_base/memory_recorder.cpp
../../../source_base/module_external/blas_connector_base.cpp
../../../source_base/module_external/blas_connector_vector.cpp
../../../source_base/module_external/blas_connector_matrix.cpp
Expand Down
2 changes: 1 addition & 1 deletion source/source_basis/module_nao/two_center_bundle.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "source_basis/module_nao/two_center_bundle.h"

#include "source_base/global_variable.h"
#include "source_base/memory.h"
#include "source_base/memory_recorder.h"
#include "source_base/parallel_common.h"
#include "source_base/ylm.h"
#include "source_basis/module_nao/real_gaunt_table.h"
Expand Down
2 changes: 1 addition & 1 deletion source/source_basis/module_pw/kernels/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ AddTest(
../../../../source_base/tool_quit.cpp ../../../../source_base/global_variable.cpp
../../../../source_base/parallel_global.cpp ../../../../source_base/parallel_reduce.cpp
../../../../source_base/parallel_comm.cpp
../../../../source_base/complexmatrix.cpp ../../../../source_base/matrix.cpp ../../../../source_base/memory.cpp
../../../../source_base/complexmatrix.cpp ../../../../source_base/matrix.cpp ../../../../source_base/memory_recorder.cpp
../../../../source_base/libm/branred.cpp ../../../../source_base/libm/sincos.cpp
../../../../source_base/module_external/blas_connector_base.cpp ../../../../source_base/module_external/blas_connector_vector.cpp ../../../../source_base/module_external/blas_connector_matrix.cpp
)
2 changes: 1 addition & 1 deletion source/source_basis/module_pw/pw_basis_k.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "source_base/constants.h"
#include "source_base/global_variable.h"
#include "source_base/memory.h"
#include "source_base/memory_recorder.h"
#include "source_base/timer.h"
#include "source_io/module_parameter/parameter.h"

Expand Down
2 changes: 1 addition & 1 deletion source/source_basis/module_pw/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ AddTest(
TARGET MODULE_PW_pw_test
LIBS parameter ${math_libs} planewave device
SOURCES ../../../source_base/matrix.cpp ../../../source_base/complexmatrix.cpp ../../../source_base/matrix3.cpp ../../../source_base/tool_quit.cpp
../../../source_base/mymath.cpp ../../../source_base/timer.cpp ../../../source_base/memory.cpp
../../../source_base/mymath.cpp ../../../source_base/timer.cpp ../../../source_base/memory_recorder.cpp
../../../source_base/module_external/blas_connector_base.cpp ../../../source_base/module_external/blas_connector_vector.cpp ../../../source_base/module_external/blas_connector_matrix.cpp
../../../source_base/libm/branred.cpp ../../../source_base/libm/sincos.cpp
../../../source_base/module_device/memory_op.cpp
Expand Down
1 change: 0 additions & 1 deletion source/source_cell/klist.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

#include "k_vector_utils.h"
#include "source_base/formatter.h"
#include "source_base/memory.h"
#include "source_base/parallel_common.h"
#include "source_base/parallel_global.h"
#include "source_base/parallel_reduce.h"
Expand Down
1 change: 0 additions & 1 deletion source/source_cell/module_neighbor/sltk_grid.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

#include "source_base/global_function.h"
#include "source_base/global_variable.h"
#include "source_base/memory.h"
#include "source_base/timer.h"

Grid::Grid(const int& test_grid_in) : test_grid(test_grid_in)
Expand Down
2 changes: 1 addition & 1 deletion source/source_cell/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ AddTest(
TARGET MODULE_CELL_ParaKpoints
LIBS parameter MPI::MPI_CXX
SOURCES parallel_kpoints_test.cpp ../../source_base/global_variable.cpp ../../source_base/parallel_global.cpp
../../source_base/parallel_common.cpp ../../source_base/parallel_comm.cpp ../parallel_kpoints.cpp ../../source_base/tool_quit.cpp ../../source_base/global_variable.cpp ../../source_base/global_file.cpp ../../source_base/global_function.cpp ../../source_base/memory.cpp ../../source_base/timer.cpp ../../source_base/parallel_reduce.cpp
../../source_base/parallel_common.cpp ../../source_base/parallel_comm.cpp ../parallel_kpoints.cpp ../../source_base/tool_quit.cpp ../../source_base/global_variable.cpp ../../source_base/global_file.cpp ../../source_base/global_function.cpp ../../source_base/memory_recorder.cpp ../../source_base/timer.cpp ../../source_base/parallel_reduce.cpp
)

# Add unit test for read_atoms_helper
Expand Down
1 change: 0 additions & 1 deletion source/source_esolver/esolver_ks_lcaopw.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
//-----stress------------------
#include "source_pw/module_pwdft/stress_pw.h"
//---------------------------------------------------
#include "source_base/memory.h"
#include "source_estate/elecstate_pw.h"
#include "source_pw/module_pwdft/hamilt_lcaopw.h"
#include "source_pw/module_pwdft/hamilt_pw.h"
Expand Down
2 changes: 1 addition & 1 deletion source/source_esolver/esolver_of_tool.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "esolver_of.h"
#include "source_base/formatter.h"
#include "source_base/memory.h"
#include "source_base/memory_recorder.h"
#include "source_estate/module_pot/efield.h"
#include "source_estate/module_pot/gatefield.h"
#include "source_io/module_parameter/parameter.h"
Expand Down
2 changes: 1 addition & 1 deletion source/source_esolver/esolver_sdft_pw.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "esolver_sdft_pw.h"

#include "source_base/global_variable.h"
#include "source_base/memory.h"
#include "source_base/memory_recorder.h"
#include "source_estate/module_charge/symmetry_rho.h"
#include "source_pw/module_stodft/sto_dos.h"
#include "source_pw/module_stodft/sto_elecond.h"
Expand Down
1 change: 0 additions & 1 deletion source/source_esolver/pw_others.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "esolver_ks_pw.h"
#include "source_base/memory.h"
#include "source_base/module_device/device.h"
#include "source_io/module_bessel/numerical_basis.h"
#include "source_io/module_bessel/numerical_descriptor.h"
Expand Down
3 changes: 0 additions & 3 deletions source/source_estate/elecstate.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
#include "elecstate.h"
#include "source_io/module_parameter/parameter.h"
#include "source_base/global_variable.h"
#include "source_io/module_parameter/parameter.h"
#include "source_base/memory.h"
#include "source_base/parallel_reduce.h"
#include "source_base/tool_title.h"
#include "occupy.h"
Expand Down
2 changes: 1 addition & 1 deletion source/source_estate/module_charge/charge.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "source_base/global_variable.h"
#include "source_base/libm/libm.h"
#include "source_base/math_integral.h"
#include "source_base/memory.h"
#include "source_base/memory_recorder.h"
#include "source_base/parallel_reduce.h"
#include "source_base/timer.h"
#include "source_base/tool_threading.h"
Expand Down
1 change: 0 additions & 1 deletion source/source_estate/module_charge/charge_init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include "source_base/libm/libm.h"
#include "source_base/math_integral.h"
#include "source_base/math_sphbes.h"
#include "source_base/memory.h"
#include "source_base/parallel_reduce.h"
#include "source_base/timer.h"
#include "source_base/tool_threading.h"
Expand Down
2 changes: 1 addition & 1 deletion source/source_estate/module_dm/density_matrix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "source_io/module_parameter/parameter.h"
#include "source_base/libm/libm.h"
#include "source_base/memory.h"
#include "source_base/memory_recorder.h"
#include "source_base/timer.h"
#include "source_base/tool_title.h"
#include "source_base/tool_quit.h"
Expand Down
2 changes: 1 addition & 1 deletion source/source_estate/module_dm/density_matrix_io.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "source_io/module_parameter/parameter.h"
#include "source_base/libm/libm.h"
#include "source_base/memory.h"
#include "source_base/memory_recorder.h"
#include "source_base/timer.h"
#include "source_base/tool_title.h"
#include "source_cell/klist.h"
Expand Down
2 changes: 1 addition & 1 deletion source/source_estate/module_pot/potential_new.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "source_base/global_function.h"
#include "source_base/global_variable.h"
#include "source_base/memory.h"
#include "source_base/memory_recorder.h"
#include "source_base/timer.h"
#include "source_base/tool_quit.h"
#include "source_base/tool_title.h"
Expand Down
1 change: 0 additions & 1 deletion source/source_estate/module_pot/potential_types.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "gatefield.h"
#include "source_base/global_function.h"
#include "source_base/global_variable.h"
#include "source_base/memory.h"
#include "source_base/timer.h"
#include "source_base/tool_quit.h"
#include "source_base/tool_title.h"
Expand Down
4 changes: 2 additions & 2 deletions source/source_hamilt/module_xc/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ AddTest(
../xc_funct_corr_gga.cpp ../xc_funct_corr_lda.cpp ../xc_funct_exch_gga.cpp
../xc_funct_exch_lda.cpp ../xc_funct_hcth.cpp
../../../source_base/matrix.cpp
../../../source_base/memory.cpp
../../../source_base/memory_recorder.cpp
../../../source_base/libm/branred.cpp
../../../source_base/libm/sincos.cpp
../../../source_base/module_external/blas_connector_base.cpp ../../../source_base/module_external/blas_connector_vector.cpp ../../../source_base/module_external/blas_connector_matrix.cpp
Expand Down Expand Up @@ -75,7 +75,7 @@ AddTest(
../xc_functional_libxc_tools.cpp
../../../source_base/module_external/blas_connector_base.cpp ../../../source_base/module_external/blas_connector_vector.cpp ../../../source_base/module_external/blas_connector_matrix.cpp
../../../source_base/matrix.cpp
../../../source_base/memory.cpp
../../../source_base/memory_recorder.cpp
../../../source_base/timer.cpp
../../../source_base/libm/branred.cpp
../../../source_base/libm/sincos.cpp
Expand Down
26 changes: 13 additions & 13 deletions source/source_hsolver/diago_cg.cpp
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#include <ATen/core/tensor_map.h>
#include <ATen/core/tensor_utils.h>
#include <ATen/kernels/lapack.h>
#include <ATen/kernels/memory.h>
#include <ATen/ops/einsum_op.h>
#include <ATen/ops/linalg_op.h>
#include <source_base/constants.h>
#include <source_base/memory.h>
#include <source_base/parallel_reduce.h>
#include <source_base/timer.h>
#include <source_base/tool_title.h> // ModuleBase::TITLE
#include <source_base/global_function.h> // ModuleBase::GlobalFunc::NOTE
#include <source_hsolver/diago_cg.h>
#include "ATen/core/tensor_map.h"
#include "ATen/core/tensor_utils.h"
#include "ATen/kernels/lapack.h"
#include "ATen/kernels/memory.h"
#include "ATen/ops/einsum_op.h"
#include "ATen/ops/linalg_op.h"
#include "source_base/constants.h"
#include "source_base/memory_recorder.h"
#include "source_base/parallel_reduce.h"
#include "source_base/timer.h"
#include "source_base/tool_title.h" // ModuleBase::TITLE
#include "source_base/global_function.h" // ModuleBase::GlobalFunc::NOTE
#include "source_hsolver/diago_cg.h"

using namespace hsolver;

Expand Down
2 changes: 1 addition & 1 deletion source/source_hsolver/hsolver_lcao.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "source_base/global_variable.h"
#include "source_base/module_device/device.h"
#include "source_estate/elecstate_tools.h"
#include "source_base/memory.h"
#include "source_base/memory_recorder.h"
#include "source_base/timer.h"
#include "source_estate/elecstate_lcao.h"
#include "source_estate/module_dm/cal_dm_psi.h"
Expand Down
Loading
Loading