comp-chem/cp2k
1
0
Fork 0
mirror of https://github.com/cp2k/cp2k.git synced 2026-07-29 06:35:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

toolchain: MPI warning, CMake dependency, and LIBXSMM update (#1736)

Browse source 
* Improved warning if MPI was requested (e.g., --with-openmpi=install).
* Install CMake if required by other packages.
* LIBXSMM for ARM64 (experimental).
This commit is contained in:
Hans Pabst 2021-11-10 15:33:56 +01:00 • committed by GitHub
parent c88c0527da
commit dc0276b66d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tools/toolchain/install_cp2k_toolchain.sh
View file

@ -326,7 +326,7 @@ if (command -v mpirun >&- 2>&-); then
export MPI_MODE=mpich
fi
else
report_warning $LINENO "No MPI installation detected on your system. Ignore this message if you are using Cray Linux Environment"
report_warning $LINENO "No MPI installation detected (ignore this message in Cray Linux Environment or when MPI installation was requested)."
export MPI_MODE=no
fi
@ -715,8 +715,15 @@ else
fi
fi
# spglib and libvori require cmake.
if [ "$with_spglib" = "__INSTALL__" ] || [ "$with_libvori" = "__INSTALL__" ]; then
# several packages require cmake.
if [ "$with_spglib" = "__INSTALL__" ] ||
[ "$with_libvori" = "__INSTALL__" ] ||
[ "$with_scalapack" = "__INSTALL__" ] ||
[ "$with_superlu" = "__INSTALL__" ] ||
[ "$with_sirius" = "__INSTALL__" ] ||
[ "$with_cosma" = "__INSTALL__" ] ||
[ "$with_spfft" = "__INSTALL__" ] ||
[ "$with_spla" = "__INSTALL__" ]; then
[ "$with_cmake" = "__DONTUSE__" ] && with_cmake="__INSTALL__"
fi

3
tools/toolchain/scripts/stage4/install_libxsmm.sh
View file

@ -28,7 +28,8 @@ cd "${BUILDDIR}"
case "$with_libxsmm" in
__INSTALL__)
echo "==================== Installing Libxsmm ===================="
if [ "$OPENBLAS_ARCH" != "x86_64" ]; then
if [[ ("$OPENBLAS_ARCH" != "x86_64") && (\
"$OPENBLAS_ARCH" != "arm64" || "$libxsmm_ver" != "master") ]]; then
report_warning $LINENO "libxsmm is not supported on arch ${OPENBLAS_ARCH}"
cat << EOF > "${BUILDDIR}/setup_libxsmm"
with_libxsmm="__DONTUSE__"