Merge remote-tracking branch 'origin/exx_pw' into exx_pw

# Conflicts:
#	source/source_pw/module_pwdft/operator_pw/op_exx_pw.cpp

Author: Flying-dragon-boxing

source/CMakeLists.txt

@@ -16,7 +16,7 @@ add_subdirectory(source_io)
 add_subdirectory(source_relax)
 add_subdirectory(source_lcao/module_ri)
 add_subdirectory(source_io/module_parameter)
-add_subdirectory(module_lr)
+add_subdirectory(source_lcao/module_lr)
 
 # add by jghan
 add_subdirectory(source_lcao/module_rdmft)

source/Makefile.Objects

@@ -20,6 +20,7 @@ VPATH=./src_global:\
 ./source_cell:\
 ./source_base:\
 ./source_base/kernels:\
+./source_base/module_external:\
 ./source_base/module_container/base/core:\
 ./source_base/module_container/ATen/core:\
 ./source_base/module_container/ATen/kernels:\
@@ -69,12 +70,12 @@ VPATH=./src_global:\
 ./src_ri:\
 ./source_lcao/module_ri:\
 ./source_io/module_parameter:\
-./module_lr:\
-./module_lr/ao_to_mo_transformer:\
-./module_lr/dm_trans:\
-./module_lr/operator_casida:\
-./module_lr/potentials:\
-./module_lr/utils:\
+./source_lcao/module_lr:\
+./source_lcao/module_lr/ao_to_mo_transformer:\
+./source_lcao/module_lr/dm_trans:\
+./source_lcao/module_lr/operator_casida:\
+./source_lcao/module_lr/potentials:\
+./source_lcao/module_lr/utils:\
 ./source_lcao/module_rdmft:\
 ./\
 

source/source_base/CMakeLists.txt

@@ -10,9 +10,9 @@ add_library(
     base
     OBJECT
     assoc_laguerre.cpp
-    blas_connector_base.cpp
-    blas_connector_vector.cpp
-    blas_connector_matrix.cpp
+    module_external/blas_connector_base.cpp
+    module_external/blas_connector_vector.cpp
+    module_external/blas_connector_matrix.cpp
     clebsch_gordan_coeff.cpp
     complexarray.cpp
     complexmatrix.cpp

source/source_base/complexmatrix.cpp

@@ -7,7 +7,7 @@
 
 #ifdef __NORMAL
 #else
-#include "blas_connector.h"
+#include "module_external/blas_connector.h"
 #endif
 
 namespace ModuleBase

source/source_base/gather_math_lib_info.cpp

@@ -8,8 +8,8 @@ Results will output to OUT/math_info.log, see ModuleBase::Global_File::make_dir_
 
 #include <ostream>
 #undef GATHER_INFO
-#include "source_base/blas_connector.h"
-#include "source_base/lapack_connector.h"
+#include "source_base/module_external/blas_connector.h"
+#include "source_base/module_external/lapack_connector.h"
 
 #include <iostream>
 

source/source_base/global_function.h

@@ -1,7 +1,7 @@
 #ifndef GLOBAL_FUNCTION_H
 #define GLOBAL_FUNCTION_H
 
-#include "blas_connector.h"
+#include "module_external/blas_connector.h"
 #include "global_function-func_each_2.h" // Peize Lin add 2016-09-07
 #include "global_variable.h"
 #include "tool_check.h" // mohan add 2021-05-08

source/source_base/global_function_ddotreal.cpp

@@ -1,4 +1,4 @@
-#include "blas_connector.h"
+#include "module_external/blas_connector.h"
 #include "global_function.h"
 #include "source_base/parallel_reduce.h"
 

source/source_base/gram_schmidt_orth-inl.h

@@ -9,7 +9,7 @@
 #include "gram_schmidt_orth.h"
 
 #include "mathzone.h"
-#include "blas_connector.h"
+#include "module_external/blas_connector.h"
 #include "math_integral.h" // mohan add 2021-04-03
 namespace ModuleBase
 {

source/source_base/inverse_matrix.cpp

@@ -1,6 +1,6 @@
 #include "inverse_matrix.h"
 #include "tool_quit.h"
-#include "lapack_connector.h"
+#include "module_external/lapack_connector.h"
 #include "timer.h"
 #include "complexmatrix.h"
 

source/source_base/kernels/math_kernel_op.cpp

@@ -1,4 +1,5 @@
 #include "source_base/kernels/math_kernel_op.h"
+#include "source_base/module_external/blas_connector.h"
 
 #include <iomanip>
 #include <iostream>