Skip to content

Commit 274e7d5

Browse files
committed
Merge branch 'publicGithubDevelop' of https://bitbucket.org/dftfedevelopers/dftfe into lowerBoundWantedSpectrumFix
2 parents 3c71e40 + 894f70e commit 274e7d5

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ ENDIF()
548548
#
549549
# ELPA. Pass path to -DCMAKE_PREFIX_PATH
550550
#
551-
find_package(ELPA 2022 REQUIRED)
551+
find_package(ELPA 2024 REQUIRED)
552552
MESSAGE(STATUS "Will Link With ELPA")
553553
target_link_libraries(${TARGETLIB} PUBLIC ELPA::ELPA)
554554

cmake/FindELPA.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ find_package(PkgConfig)
1818
# elpa-2020.05.001.pc
1919
set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE)
2020
foreach(pkg elpa_openmp elpa) # prioritize elpa_openmp
21-
foreach(ver 2022.11.001)
21+
foreach(ver 2024.03.001)
2222
pkg_search_module(PC_ELPA ${pkg})
2323
if(PC_ELPA_FOUND)
2424
break()

doc/manual/installation.tex

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ \subsubsection{Instructions for dependencies: ALGLIB, Libxc, spglib, Libxml2, Sc
5959
\item {\bf ScaLAPACK}: ScaLAPACK library is used by DFT-FE via ELPA for its parallel linear algebra routines involving dense matrices, as well being a dependency for ELPA. \textcolor{red}{\bf If Intel MKL math library is available, please skip this step, as the ScaLAPACK libraries therein can be used directly.} If Intel MKL math library is not available, Netlib ScaLAPACK \url{http://www.netlib.org/scalapack/} needs to be installed using the instructions below. Download the current release version (2.2.0) from \url{http://www.netlib.org/scalapack/#\_software}, and build a shared library (use \verb|BUILD_SHARED_LIBS=ON|, \verb|BUILD_STATIC_LIBS=OFF| and \verb|BUILD_TESTING=OFF|) installation of ScaLAPACK using cmake. We recommend using the ccmake gui interface for the installation. Further, use the appropriate compilers for \verb|CMAKE_C_COMPILER| and \verb|CMAKE_FORTRAN_COMPILER|, and also use \verb|-fPIC| flag for \verb|CMAKE_C_FLAGS| and \verb|-fPIC -fallow-argument-mismatch| for \verb|CMAKE_Fortran_FLAGS|. For best performance, ScaLAPACK must be linked to optimized BLAS-LAPACK libraries by using\\ \verb|USE_OPTIMIZED_LAPACK_BLAS=ON|, and providing external paths to BLAS-LAPACK libraries (MKL, OpenBlas, ESSL etc.) during the cmake configuration.
6060
%Alternatively one can also use the python based installer~\url{http://www.netlib.org/scalapack/scalapack_installer.tgz} for Linux.
6161

62-
\item {\bf ELPA}: ELPA library is used by DFT-FE for its parallel linear algebra routines involving dense matrices. ELPA requires the ScaLAPACK library (see above) as a dependency. Download the latest version elpa-2022.11.001 from \url{https://elpa.mpcdf.mpg.de/software/} and follow the installation instructions in there. Example of ELPA installation on UMICH Greatlakes supercomputer with GNU compiler, Open MPI library, and Intel MKL math library:
62+
\item {\bf ELPA}: ELPA library is used by DFT-FE for its parallel linear algebra routines involving dense matrices. ELPA requires the ScaLAPACK library (see above) as a dependency. Download the latest version elpa-2024.03.001 from \url{https://elpa.mpcdf.mpg.de/software/} and follow the installation instructions in there. Example of ELPA installation on UMICH Greatlakes supercomputer with GNU compiler, Open MPI library, and Intel MKL math library:
6363
\begin{verbatim}
6464
$ cd elpaDir
6565
$ mkdir build

setupDevelopPetsc.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ libxcDir="/home/vikramg/DFT-softwares-gcc/libxc/libxc-5.2.3/install_libxc5.2.3"
2424
spglibDir="/home/vikramg/DFT-softwares-gcc/spglib/install"
2525
xmlIncludeDir="/usr/include/libxml2"
2626
xmlLibDir="/usr/lib64"
27-
ELPA_PATH="/home/vikramg/DFT-softwares-gcc/elpa/install202211"
27+
ELPA_PATH="/home/vikramg/DFT-softwares-gcc/elpa/install2024"
2828

2929

3030
#Paths for optional external libraries

0 commit comments

Comments
 (0)