Skip to content

Commit 063bd69

Browse files
authored
[Refactor] Move module_lr to source_lcao and add a new folder module_external in source_base (#6388)
* Move module_lr to source_lcao * Fix test build * Move blas_connector to module_external * Fix header use * Fix internal header use * A fierce battle with Makefile😡 * Move blacs_connector.h to module_external * Move lapack_connector.h and lapack_wrapper.h to module_external * Fix header usage * Move scalapack_connector.h to module_external
1 parent 6d035e7 commit 063bd69

File tree

207 files changed

+269
-268
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+269
-268
lines changed

source/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ add_subdirectory(source_io)
1616
add_subdirectory(source_relax)
1717
add_subdirectory(source_lcao/module_ri)
1818
add_subdirectory(source_io/module_parameter)
19-
add_subdirectory(module_lr)
19+
add_subdirectory(source_lcao/module_lr)
2020

2121
# add by jghan
2222
add_subdirectory(source_lcao/module_rdmft)

source/Makefile.Objects

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ VPATH=./src_global:\
2020
./source_cell:\
2121
./source_base:\
2222
./source_base/kernels:\
23+
./source_base/module_external:\
2324
./source_base/module_container/base/core:\
2425
./source_base/module_container/ATen/core:\
2526
./source_base/module_container/ATen/kernels:\
@@ -69,12 +70,12 @@ VPATH=./src_global:\
6970
./src_ri:\
7071
./source_lcao/module_ri:\
7172
./source_io/module_parameter:\
72-
./module_lr:\
73-
./module_lr/ao_to_mo_transformer:\
74-
./module_lr/dm_trans:\
75-
./module_lr/operator_casida:\
76-
./module_lr/potentials:\
77-
./module_lr/utils:\
73+
./source_lcao/module_lr:\
74+
./source_lcao/module_lr/ao_to_mo_transformer:\
75+
./source_lcao/module_lr/dm_trans:\
76+
./source_lcao/module_lr/operator_casida:\
77+
./source_lcao/module_lr/potentials:\
78+
./source_lcao/module_lr/utils:\
7879
./source_lcao/module_rdmft:\
7980
./\
8081

source/source_base/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ add_library(
1010
base
1111
OBJECT
1212
assoc_laguerre.cpp
13-
blas_connector_base.cpp
14-
blas_connector_vector.cpp
15-
blas_connector_matrix.cpp
13+
module_external/blas_connector_base.cpp
14+
module_external/blas_connector_vector.cpp
15+
module_external/blas_connector_matrix.cpp
1616
clebsch_gordan_coeff.cpp
1717
complexarray.cpp
1818
complexmatrix.cpp

source/source_base/complexmatrix.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#ifdef __NORMAL
99
#else
10-
#include "blas_connector.h"
10+
#include "module_external/blas_connector.h"
1111
#endif
1212

1313
namespace ModuleBase

source/source_base/gather_math_lib_info.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Results will output to OUT/math_info.log, see ModuleBase::Global_File::make_dir_
88

99
#include <ostream>
1010
#undef GATHER_INFO
11-
#include "source_base/blas_connector.h"
12-
#include "source_base/lapack_connector.h"
11+
#include "source_base/module_external/blas_connector.h"
12+
#include "source_base/module_external/lapack_connector.h"
1313

1414
#include <iostream>
1515

source/source_base/global_function.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef GLOBAL_FUNCTION_H
22
#define GLOBAL_FUNCTION_H
33

4-
#include "blas_connector.h"
4+
#include "module_external/blas_connector.h"
55
#include "global_function-func_each_2.h" // Peize Lin add 2016-09-07
66
#include "global_variable.h"
77
#include "tool_check.h" // mohan add 2021-05-08

source/source_base/global_function_ddotreal.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "blas_connector.h"
1+
#include "module_external/blas_connector.h"
22
#include "global_function.h"
33
#include "source_base/parallel_reduce.h"
44

source/source_base/gram_schmidt_orth-inl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "gram_schmidt_orth.h"
1010

1111
#include "mathzone.h"
12-
#include "blas_connector.h"
12+
#include "module_external/blas_connector.h"
1313
#include "math_integral.h" // mohan add 2021-04-03
1414
namespace ModuleBase
1515
{

source/source_base/inverse_matrix.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "inverse_matrix.h"
22
#include "tool_quit.h"
3-
#include "lapack_connector.h"
3+
#include "module_external/lapack_connector.h"
44
#include "timer.h"
55
#include "complexmatrix.h"
66

source/source_base/kernels/math_kernel_op.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include "source_base/macros.h"
77

8-
#include "source_base/blas_connector.h"
8+
#include "source_base/module_external/blas_connector.h"
99
#include "source_base/parallel_reduce.h"
1010

1111
#include "source_base/module_device/memory_op.h"

0 commit comments

Comments
 (0)