Merge branch 'develop' into dm_construct

maki49 · Oct 15, 2024 · 686ff72 · 686ff72
2 parents a8c1164 + 0f0c838
commit 686ff72
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 45 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -15,10 +15,10 @@ jobs:
         uses: actions/checkout@v4
       - name: Install Requirements for Coverage Testing
         run: |
-          apt update && apt install -y lcov
+          apt update && apt install -y lcov gpg
       - name: Building
         run: |
-          cmake -B build -DBUILD_TESTING=ON -DENABLE_DEEPKS=ON -DENABLE_LIBXC=ON -DENABLE_LIBRI=ON -DENABLE_PAW=ON -DENABLE_GOOGLEBENCH=ON -DENABLE_RAPIDJSON=ON
+          cmake -B build -DENABLE_COVERAGE=ON -DBUILD_TESTING=ON -DENABLE_DEEPKS=ON -DENABLE_LIBXC=ON -DENABLE_LIBRI=ON -DENABLE_PAW=ON -DENABLE_GOOGLEBENCH=ON -DENABLE_RAPIDJSON=ON
           cmake --build build -j`nproc`
           cmake --install build
       - name: Testing

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -39,7 +39,7 @@ jobs:
             --from-ref ${{ github.event.pull_request.base.sha }}
               --to-ref ${{ github.event.pull_request.head.sha }}
         continue-on-error: true
-      - uses: pre-commit-ci/lite-action@v1.0.3
+      - uses: pre-commit-ci/lite-action@v1.1.0
 
       - name: Build
         run: |

diff --git a/source/module_hsolver/diago_bpcg.h b/source/module_hsolver/diago_bpcg.h
@@ -24,7 +24,7 @@ namespace hsolver {
  * @tparam Device The device used for calculations (e.g., cpu or gpu).
  */
 template <typename T = std::complex<double>, typename Device = base_device::DEVICE_CPU>
-class DiagoBPCG : public DiagH<T, Device>
+class DiagoBPCG
 {
   private:
     // Note GetTypeReal<T>::type will 
@@ -56,15 +56,15 @@ class DiagoBPCG : public DiagH<T, Device>
     void init_iter(const psi::Psi<T, Device> &psi_in);
 
     /**
-     * @brief Diagonalize the Hamiltonian using the CG method.
+     * @brief Diagonalize the Hamiltonian using the BPCG method.
      *
-     * This function is an override function for the CG method. It is called by the HsolverPW::solve() function.
+     * This function is called by the HsolverPW::solve() function.
      *
      * @param phm_in A pointer to the hamilt::Hamilt object representing the Hamiltonian operator.
      * @param psi The input wavefunction psi matrix with [dim: n_basis x n_band, column major].
      * @param eigenvalue_in Pointer to the eigen array with [dim: n_band, column major].
      */
-    void diag(hamilt::Hamilt<T, Device> *phm_in, psi::Psi<T, Device> &psi, Real *eigenvalue_in) override;
+    void diag(hamilt::Hamilt<T, Device> *phm_in, psi::Psi<T, Device> &psi, Real *eigenvalue_in);
 
 
   private:

diff --git a/source/module_hsolver/diago_cg.h b/source/module_hsolver/diago_cg.h
@@ -13,7 +13,7 @@
 namespace hsolver {
 
 template <typename T, typename Device = base_device::DEVICE_CPU>
-class DiagoCG final : public DiagH<T, Device>
+class DiagoCG final
 {
     // private: accessibility within class is private by default
     // Note GetTypeReal<T>::type will
@@ -36,11 +36,11 @@ class DiagoCG final : public DiagH<T, Device>
         const int& pw_diag_nmax,
         const int& nproc_in_pool);
 
-    ~DiagoCG() override;
+    ~DiagoCG();
 
     // virtual void init(){};
     // refactor hpsi_info
-    // this is the override function diag() for CG method
+    // this is the diag() function for CG method
     void diag(const Func& hpsi_func, const Func& spsi_func, ct::Tensor& psi, ct::Tensor& eigen, const ct::Tensor& prec = {});
 
   private:

diff --git a/source/module_hsolver/diago_dav_subspace.h b/source/module_hsolver/diago_dav_subspace.h
@@ -11,7 +11,7 @@ namespace hsolver
 {
 
 template <typename T = std::complex<double>, typename Device = base_device::DEVICE_CPU>
-class Diago_DavSubspace : public DiagH<T, Device>
+class Diago_DavSubspace
 {
   private:
     // Note GetTypeReal<T>::type will
@@ -29,7 +29,7 @@ class Diago_DavSubspace : public DiagH<T, Device>
                       const bool& need_subspace_in,
                       const diag_comm_info& diag_comm_in);
 
-    virtual ~Diago_DavSubspace() override;
+    ~Diago_DavSubspace();
 
     // See diago_david.h for information on the HPsiFunc function type
     using HPsiFunc = std::function<void(T*, T*, const int, const int)>;

diff --git a/source/module_hsolver/diago_david.h b/source/module_hsolver/diago_david.h
@@ -8,7 +8,7 @@ namespace hsolver
 {
 
 template <typename T = std::complex<double>, typename Device = base_device::DEVICE_CPU>
-class DiagoDavid : public DiagH<T, Device>
+class DiagoDavid
 {
   private:
     // Note GetTypeReal<T>::type will 
@@ -25,7 +25,7 @@ class DiagoDavid : public DiagH<T, Device>
                const bool use_paw_in,
                const diag_comm_info& diag_comm_in);
 
-    virtual ~DiagoDavid() override;
+     ~DiagoDavid();
 
 
     // declare type of matrix-blockvector functions.

diff --git a/source/module_hsolver/hsolver_pw.cpp b/source/module_hsolver/hsolver_pw.cpp
@@ -228,7 +228,7 @@ void HSolverPW<T, Device>::solve(hamilt::Hamilt<T, Device>* pHamilt,
     const std::initializer_list<std::string> _methods = {"cg", "dav", "dav_subspace", "bpcg"};
     if (std::find(std::begin(_methods), std::end(_methods), this->method) == std::end(_methods))
     {
-        ModuleBase::WARNING_QUIT("HSolverPW::solve", "This method of DiagH is not supported!");
+        ModuleBase::WARNING_QUIT("HSolverPW::solve", "This type of eigensolver is not supported!");
     }
 
     // prepare for the precondition of diagonalization

diff --git a/source/module_hsolver/test/test_hsolver.cpp b/source/module_hsolver/test/test_hsolver.cpp
@@ -83,28 +83,4 @@ class TestHSolver : public ::testing::Test
 
 // 	double test_diagethr_d = hs_d.set_diagethr(0.0, 0, 0, 0.0);
 // 	EXPECT_EQ(test_diagethr_d, 0.0);
-// }
-namespace hsolver
-{
-template <typename T, typename Device = base_device::DEVICE_CPU>
-class DiagH_mock : public DiagH<T, Device>
-{
-  private:
-    using Real = typename GetTypeReal<T>::type;
-
-  public:
-    DiagH_mock()
-    {
-    }
-    ~DiagH_mock()
-    {
-    }
-
-    void diag(hamilt::Hamilt<T, Device>* phm_in, psi::Psi<T, Device>& psi, Real* eigenvalue_in)
-    {
-        return;
-    }
-	};
-	template class DiagH_mock<std::complex<float>>;
-	template class DiagH_mock<std::complex<double>>;
-}
+// }
diff --git a/toolchain/build_abacus_gnu.sh b/toolchain/build_abacus_gnu.sh
@@ -22,9 +22,9 @@ BUILD_DIR=build_abacus_gnu
 rm -rf $BUILD_DIR
 
 PREFIX=$ABACUS_DIR
-LAPACK=$INSTALL_DIR/openblas-0.3.27/lib
+LAPACK=$INSTALL_DIR/openblas-0.3.28/lib
 SCALAPACK=$INSTALL_DIR/scalapack-2.2.1/lib
-ELPA=$INSTALL_DIR/elpa-2024.03.001/cpu
+ELPA=$INSTALL_DIR/elpa-2024.05.001/cpu
 FFTW3=$INSTALL_DIR/fftw-3.3.10
 CEREAL=$INSTALL_DIR/cereal-1.3.2/include/cereal
 LIBXC=$INSTALL_DIR/libxc-6.2.2

diff --git a/toolchain/build_abacus_intel-mpich.sh b/toolchain/build_abacus_intel-mpich.sh
@@ -23,7 +23,7 @@ BUILD_DIR=build_abacus_intel-mpich
 rm -rf $BUILD_DIR
 
 PREFIX=$ABACUS_DIR
-ELPA=$INSTALL_DIR/elpa-2024.03.001/cpu
+ELPA=$INSTALL_DIR/elpa-2024.05.001/cpu
 CEREAL=$INSTALL_DIR/cereal-1.3.2/include/cereal
 LIBXC=$INSTALL_DIR/libxc-6.2.2
 RAPIDJSON=$INSTALL_DIR/rapidjson-1.1.0/

diff --git a/toolchain/build_abacus_intel.sh b/toolchain/build_abacus_intel.sh
@@ -23,7 +23,7 @@ BUILD_DIR=build_abacus_intel
 rm -rf $BUILD_DIR
 
 PREFIX=$ABACUS_DIR
-ELPA=$INSTALL_DIR/elpa-2024.03.001/cpu
+ELPA=$INSTALL_DIR/elpa-2024.05.001/cpu
 CEREAL=$INSTALL_DIR/cereal-1.3.2/include/cereal
 LIBXC=$INSTALL_DIR/libxc-6.2.2
 RAPIDJSON=$INSTALL_DIR/rapidjson-1.1.0/

diff --git a/toolchain/scripts/stage3/install_elpa.sh b/toolchain/scripts/stage3/install_elpa.sh
@@ -60,7 +60,7 @@ case "$with_elpa" in
     else
       require_env MATH_LIBS
       elpa_pkg="elpa-${elpa_ver}.tar.gz"
-      url=f"https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${elpa_ver}/${elpa_pkg}"
+      url="https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${elpa_ver}/${elpa_pkg}"
       if [ -f ${elpa_pkg} ]; then
         echo "${elpa_pkg} is found"
       else