From d3ca9b636b9485dd202d3174f02a3ec8ecedf813 Mon Sep 17 00:00:00 2001 From: Critsium-xy Date: Mon, 14 Jul 2025 13:51:40 +0800 Subject: [PATCH 1/3] Rename grid to module_grid --- source/source_base/CMakeLists.txt | 2 +- source/source_base/{grid => module_grid}/batch.cpp | 2 +- source/source_base/{grid => module_grid}/batch.h | 0 source/source_base/{grid => module_grid}/delley.cpp | 2 +- source/source_base/{grid => module_grid}/delley.h | 0 source/source_base/{grid => module_grid}/partition.cpp | 2 +- source/source_base/{grid => module_grid}/partition.h | 0 source/source_base/{grid => module_grid}/radial.cpp | 2 +- source/source_base/{grid => module_grid}/radial.h | 0 .../source_base/{grid => module_grid}/test/CMakeLists.txt | 0 .../source_base/{grid => module_grid}/test/test_batch.cpp | 2 +- .../source_base/{grid => module_grid}/test/test_delley.cpp | 2 +- .../{grid => module_grid}/test/test_partition.cpp | 6 +++--- .../source_base/{grid => module_grid}/test/test_radial.cpp | 2 +- 14 files changed, 11 insertions(+), 11 deletions(-) rename source/source_base/{grid => module_grid}/batch.cpp (98%) rename source/source_base/{grid => module_grid}/batch.h (100%) rename source/source_base/{grid => module_grid}/delley.cpp (99%) rename source/source_base/{grid => module_grid}/delley.h (100%) rename source/source_base/{grid => module_grid}/partition.cpp (98%) rename source/source_base/{grid => module_grid}/partition.h (100%) rename source/source_base/{grid => module_grid}/radial.cpp (97%) rename source/source_base/{grid => module_grid}/radial.h (100%) rename source/source_base/{grid => module_grid}/test/CMakeLists.txt (100%) rename source/source_base/{grid => module_grid}/test/test_batch.cpp (99%) rename source/source_base/{grid => module_grid}/test/test_delley.cpp (98%) rename source/source_base/{grid => module_grid}/test/test_partition.cpp (98%) rename source/source_base/{grid => module_grid}/test/test_radial.cpp (98%) diff --git a/source/source_base/CMakeLists.txt b/source/source_base/CMakeLists.txt index be89ad8e267..0da294e42c6 100644 --- a/source/source_base/CMakeLists.txt +++ b/source/source_base/CMakeLists.txt @@ -85,7 +85,7 @@ if(BUILD_TESTING) add_subdirectory(kernels/test) add_subdirectory(module_mixing/test) add_subdirectory(module_device/test) - add_subdirectory(grid/test) + add_subdirectory(module_grid/test) if (USE_ABACUS_LIBM) add_subdirectory(libm/test) endif() diff --git a/source/source_base/grid/batch.cpp b/source/source_base/module_grid/batch.cpp similarity index 98% rename from source/source_base/grid/batch.cpp rename to source/source_base/module_grid/batch.cpp index ec461db6559..50c15fce891 100644 --- a/source/source_base/grid/batch.cpp +++ b/source/source_base/module_grid/batch.cpp @@ -1,4 +1,4 @@ -#include "source_base/grid/batch.h" +#include "source_base/module_grid/batch.h" #include #include diff --git a/source/source_base/grid/batch.h b/source/source_base/module_grid/batch.h similarity index 100% rename from source/source_base/grid/batch.h rename to source/source_base/module_grid/batch.h diff --git a/source/source_base/grid/delley.cpp b/source/source_base/module_grid/delley.cpp similarity index 99% rename from source/source_base/grid/delley.cpp rename to source/source_base/module_grid/delley.cpp index a170ff04f70..3c4431542ae 100644 --- a/source/source_base/grid/delley.cpp +++ b/source/source_base/module_grid/delley.cpp @@ -1,4 +1,4 @@ -#include "source_base/grid/delley.h" +#include "source_base/module_grid/delley.h" #include #include diff --git a/source/source_base/grid/delley.h b/source/source_base/module_grid/delley.h similarity index 100% rename from source/source_base/grid/delley.h rename to source/source_base/module_grid/delley.h diff --git a/source/source_base/grid/partition.cpp b/source/source_base/module_grid/partition.cpp similarity index 98% rename from source/source_base/grid/partition.cpp rename to source/source_base/module_grid/partition.cpp index 8b474fd1165..9147d39b1fb 100644 --- a/source/source_base/grid/partition.cpp +++ b/source/source_base/module_grid/partition.cpp @@ -1,4 +1,4 @@ -#include "source_base/grid/partition.h" +#include "source_base/module_grid/partition.h" #include "source_base/constants.h" #include diff --git a/source/source_base/grid/partition.h b/source/source_base/module_grid/partition.h similarity index 100% rename from source/source_base/grid/partition.h rename to source/source_base/module_grid/partition.h diff --git a/source/source_base/grid/radial.cpp b/source/source_base/module_grid/radial.cpp similarity index 97% rename from source/source_base/grid/radial.cpp rename to source/source_base/module_grid/radial.cpp index 6baf40c3e87..943e61e9bb7 100644 --- a/source/source_base/grid/radial.cpp +++ b/source/source_base/module_grid/radial.cpp @@ -1,4 +1,4 @@ -#include "source_base/grid/radial.h" +#include "source_base/module_grid/radial.h" #include diff --git a/source/source_base/grid/radial.h b/source/source_base/module_grid/radial.h similarity index 100% rename from source/source_base/grid/radial.h rename to source/source_base/module_grid/radial.h diff --git a/source/source_base/grid/test/CMakeLists.txt b/source/source_base/module_grid/test/CMakeLists.txt similarity index 100% rename from source/source_base/grid/test/CMakeLists.txt rename to source/source_base/module_grid/test/CMakeLists.txt diff --git a/source/source_base/grid/test/test_batch.cpp b/source/source_base/module_grid/test/test_batch.cpp similarity index 99% rename from source/source_base/grid/test/test_batch.cpp rename to source/source_base/module_grid/test/test_batch.cpp index 74c3d943862..8f727602c77 100644 --- a/source/source_base/grid/test/test_batch.cpp +++ b/source/source_base/module_grid/test/test_batch.cpp @@ -1,4 +1,4 @@ -#include "source_base/grid/batch.h" +#include "source_base/module_grid/batch.h" #include "gtest/gtest.h" #include diff --git a/source/source_base/grid/test/test_delley.cpp b/source/source_base/module_grid/test/test_delley.cpp similarity index 98% rename from source/source_base/grid/test/test_delley.cpp rename to source/source_base/module_grid/test/test_delley.cpp index 88647fd6c00..8de247a5335 100644 --- a/source/source_base/grid/test/test_delley.cpp +++ b/source/source_base/module_grid/test/test_delley.cpp @@ -1,4 +1,4 @@ -#include "source_base/grid/delley.h" +#include "source_base/module_grid/delley.h" #include "source_base/ylm.h" #include "gtest/gtest.h" diff --git a/source/source_base/grid/test/test_partition.cpp b/source/source_base/module_grid/test/test_partition.cpp similarity index 98% rename from source/source_base/grid/test/test_partition.cpp rename to source/source_base/module_grid/test/test_partition.cpp index 8f2535de3b1..0615dc44637 100644 --- a/source/source_base/grid/test/test_partition.cpp +++ b/source/source_base/module_grid/test/test_partition.cpp @@ -1,6 +1,6 @@ -#include "source_base/grid/partition.h" -#include "source_base/grid/radial.h" -#include "source_base/grid/delley.h" +#include "source_base/module_grid/partition.h" +#include "source_base/module_grid/radial.h" +#include "source_base/module_grid/delley.h" #include "source_base/constants.h" #include "gtest/gtest.h" diff --git a/source/source_base/grid/test/test_radial.cpp b/source/source_base/module_grid/test/test_radial.cpp similarity index 98% rename from source/source_base/grid/test/test_radial.cpp rename to source/source_base/module_grid/test/test_radial.cpp index 4635a41e546..abd91931f5e 100644 --- a/source/source_base/grid/test/test_radial.cpp +++ b/source/source_base/module_grid/test/test_radial.cpp @@ -1,4 +1,4 @@ -#include "source_base/grid/radial.h" +#include "source_base/module_grid/radial.h" #include "gtest/gtest.h" #include From ab91e9e54fd25fd25d738f1e04328c86de732bcc Mon Sep 17 00:00:00 2001 From: Critsium-xy Date: Mon, 14 Jul 2025 14:36:43 +0800 Subject: [PATCH 2/3] Rename genelpa to module_genelpa --- source/Makefile.Objects | 2 +- source/source_hsolver/diag_hs_para.cpp | 2 +- source/source_hsolver/diago_elpa.cpp | 2 +- source/source_hsolver/diago_elpa_native.cpp | 2 +- source/source_hsolver/kernels/cuda/diag_cusolvermp.cu | 2 +- .../source_hsolver/{genelpa => module_genelpa}/CMakeLists.txt | 0 source/source_hsolver/{genelpa => module_genelpa}/Cblacs.h | 0 source/source_hsolver/{genelpa => module_genelpa}/README | 0 .../source_hsolver/{genelpa => module_genelpa}/elpa_generic.hpp | 0 source/source_hsolver/{genelpa => module_genelpa}/elpa_new.cpp | 0 source/source_hsolver/{genelpa => module_genelpa}/elpa_new.h | 0 .../{genelpa => module_genelpa}/elpa_new_complex.cpp | 0 .../{genelpa => module_genelpa}/elpa_new_real.cpp | 0 source/source_hsolver/{genelpa => module_genelpa}/elpa_solver.h | 0 source/source_hsolver/{genelpa => module_genelpa}/pblas.h | 0 source/source_hsolver/{genelpa => module_genelpa}/scalapack.h | 0 source/source_hsolver/{genelpa => module_genelpa}/utils.cpp | 0 source/source_hsolver/{genelpa => module_genelpa}/utils.h | 0 18 files changed, 5 insertions(+), 5 deletions(-) rename source/source_hsolver/{genelpa => module_genelpa}/CMakeLists.txt (100%) rename source/source_hsolver/{genelpa => module_genelpa}/Cblacs.h (100%) rename source/source_hsolver/{genelpa => module_genelpa}/README (100%) rename source/source_hsolver/{genelpa => module_genelpa}/elpa_generic.hpp (100%) rename source/source_hsolver/{genelpa => module_genelpa}/elpa_new.cpp (100%) rename source/source_hsolver/{genelpa => module_genelpa}/elpa_new.h (100%) rename source/source_hsolver/{genelpa => module_genelpa}/elpa_new_complex.cpp (100%) rename source/source_hsolver/{genelpa => module_genelpa}/elpa_new_real.cpp (100%) rename source/source_hsolver/{genelpa => module_genelpa}/elpa_solver.h (100%) rename source/source_hsolver/{genelpa => module_genelpa}/pblas.h (100%) rename source/source_hsolver/{genelpa => module_genelpa}/scalapack.h (100%) rename source/source_hsolver/{genelpa => module_genelpa}/utils.cpp (100%) rename source/source_hsolver/{genelpa => module_genelpa}/utils.h (100%) diff --git a/source/Makefile.Objects b/source/Makefile.Objects index baf40df2e35..915ad8909f8 100644 --- a/source/Makefile.Objects +++ b/source/Makefile.Objects @@ -32,7 +32,7 @@ VPATH=./src_global:\ ./source_esolver:\ ./source_hsolver:\ ./source_hsolver/kernels:\ -./source_hsolver/genelpa:\ +./source_hsolver/module_genelpa:\ ./source_hsolver/module_pexsi:\ ./source_estate:\ ./source_estate/kernels:\ diff --git a/source/source_hsolver/diag_hs_para.cpp b/source/source_hsolver/diag_hs_para.cpp index b68eeebf3ca..2fe15ad086b 100644 --- a/source/source_hsolver/diag_hs_para.cpp +++ b/source/source_hsolver/diag_hs_para.cpp @@ -5,7 +5,7 @@ #include "source_hsolver/diago_pxxxgvx.h" #ifdef __ELPA -#include "source_hsolver/genelpa/elpa_solver.h" +#include "source_hsolver/module_genelpa/elpa_solver.h" #endif #include diff --git a/source/source_hsolver/diago_elpa.cpp b/source/source_hsolver/diago_elpa.cpp index 2aa4a5acb41..a25d9e8418d 100644 --- a/source/source_hsolver/diago_elpa.cpp +++ b/source/source_hsolver/diago_elpa.cpp @@ -1,7 +1,7 @@ #include "diago_elpa.h" #include "source_io/module_parameter/parameter.h" -#include "genelpa/elpa_solver.h" +#include "module_genelpa/elpa_solver.h" #include "source_base/blacs_connector.h" #include "source_base/global_variable.h" #include "source_base/lapack_connector.h" diff --git a/source/source_hsolver/diago_elpa_native.cpp b/source/source_hsolver/diago_elpa_native.cpp index 790f8f92710..c44055035a2 100644 --- a/source/source_hsolver/diago_elpa_native.cpp +++ b/source/source_hsolver/diago_elpa_native.cpp @@ -7,7 +7,7 @@ #include "source_base/scalapack_connector.h" #include "source_base/timer.h" #include "source_base/tool_quit.h" -#include "source_hsolver/genelpa/elpa_new.h" +#include "source_hsolver/module_genelpa/elpa_new.h" #include "omp.h" namespace hsolver diff --git a/source/source_hsolver/kernels/cuda/diag_cusolvermp.cu b/source/source_hsolver/kernels/cuda/diag_cusolvermp.cu index 15a0eca612f..032efd797b4 100644 --- a/source/source_hsolver/kernels/cuda/diag_cusolvermp.cu +++ b/source/source_hsolver/kernels/cuda/diag_cusolvermp.cu @@ -7,7 +7,7 @@ extern "C" { -#include "source_hsolver/genelpa/Cblacs.h" +#include "source_hsolver/module_genelpa/Cblacs.h" } #include #include diff --git a/source/source_hsolver/genelpa/CMakeLists.txt b/source/source_hsolver/module_genelpa/CMakeLists.txt similarity index 100% rename from source/source_hsolver/genelpa/CMakeLists.txt rename to source/source_hsolver/module_genelpa/CMakeLists.txt diff --git a/source/source_hsolver/genelpa/Cblacs.h b/source/source_hsolver/module_genelpa/Cblacs.h similarity index 100% rename from source/source_hsolver/genelpa/Cblacs.h rename to source/source_hsolver/module_genelpa/Cblacs.h diff --git a/source/source_hsolver/genelpa/README b/source/source_hsolver/module_genelpa/README similarity index 100% rename from source/source_hsolver/genelpa/README rename to source/source_hsolver/module_genelpa/README diff --git a/source/source_hsolver/genelpa/elpa_generic.hpp b/source/source_hsolver/module_genelpa/elpa_generic.hpp similarity index 100% rename from source/source_hsolver/genelpa/elpa_generic.hpp rename to source/source_hsolver/module_genelpa/elpa_generic.hpp diff --git a/source/source_hsolver/genelpa/elpa_new.cpp b/source/source_hsolver/module_genelpa/elpa_new.cpp similarity index 100% rename from source/source_hsolver/genelpa/elpa_new.cpp rename to source/source_hsolver/module_genelpa/elpa_new.cpp diff --git a/source/source_hsolver/genelpa/elpa_new.h b/source/source_hsolver/module_genelpa/elpa_new.h similarity index 100% rename from source/source_hsolver/genelpa/elpa_new.h rename to source/source_hsolver/module_genelpa/elpa_new.h diff --git a/source/source_hsolver/genelpa/elpa_new_complex.cpp b/source/source_hsolver/module_genelpa/elpa_new_complex.cpp similarity index 100% rename from source/source_hsolver/genelpa/elpa_new_complex.cpp rename to source/source_hsolver/module_genelpa/elpa_new_complex.cpp diff --git a/source/source_hsolver/genelpa/elpa_new_real.cpp b/source/source_hsolver/module_genelpa/elpa_new_real.cpp similarity index 100% rename from source/source_hsolver/genelpa/elpa_new_real.cpp rename to source/source_hsolver/module_genelpa/elpa_new_real.cpp diff --git a/source/source_hsolver/genelpa/elpa_solver.h b/source/source_hsolver/module_genelpa/elpa_solver.h similarity index 100% rename from source/source_hsolver/genelpa/elpa_solver.h rename to source/source_hsolver/module_genelpa/elpa_solver.h diff --git a/source/source_hsolver/genelpa/pblas.h b/source/source_hsolver/module_genelpa/pblas.h similarity index 100% rename from source/source_hsolver/genelpa/pblas.h rename to source/source_hsolver/module_genelpa/pblas.h diff --git a/source/source_hsolver/genelpa/scalapack.h b/source/source_hsolver/module_genelpa/scalapack.h similarity index 100% rename from source/source_hsolver/genelpa/scalapack.h rename to source/source_hsolver/module_genelpa/scalapack.h diff --git a/source/source_hsolver/genelpa/utils.cpp b/source/source_hsolver/module_genelpa/utils.cpp similarity index 100% rename from source/source_hsolver/genelpa/utils.cpp rename to source/source_hsolver/module_genelpa/utils.cpp diff --git a/source/source_hsolver/genelpa/utils.h b/source/source_hsolver/module_genelpa/utils.h similarity index 100% rename from source/source_hsolver/genelpa/utils.h rename to source/source_hsolver/module_genelpa/utils.h From 6e64666aaefc175029517628fc0eb1f6458c95b9 Mon Sep 17 00:00:00 2001 From: Critsium-xy Date: Mon, 14 Jul 2025 14:39:59 +0800 Subject: [PATCH 3/3] Fix cmake --- source/source_hsolver/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/source_hsolver/CMakeLists.txt b/source/source_hsolver/CMakeLists.txt index 6ccfa42c2ee..8fa1d179836 100644 --- a/source/source_hsolver/CMakeLists.txt +++ b/source/source_hsolver/CMakeLists.txt @@ -79,7 +79,7 @@ if(ENABLE_COVERAGE) endif() if(ENABLE_LCAO AND USE_ELPA) - add_subdirectory(genelpa) + add_subdirectory(module_genelpa) endif() IF (BUILD_TESTING)