Skip to content
Snippets Groups Projects
Commit 003e1f27 authored by Ashwin Kumar Karnad's avatar Ashwin Kumar Karnad
Browse files

conf-wrappers: set LIBS_ELPA FCFLAGS_ELPA

parent 534f2cae
No related branches found
No related tags found
1 merge request!31conf-wrappers: set LIBS_ELPA FCFLAGS_ELPA
Hide whitespace changes
Inline Side-by-side
octopus/foss2021a-cuda-mpi-config.sh
+ 2
− 1
View file @ 003e1f27
...@@ -11,7 +11,8 @@ export LDFLAGS=`echo ${LIBRARY_PATH:+:$LIBRARY_PATH} | sed -e 's/:/ -Wl,-rpath=/ ...@@ -11,7 +11,8 @@ export LDFLAGS=`echo ${LIBRARY_PATH:+:$LIBRARY_PATH} | sed -e 's/:/ -Wl,-rpath=/
# HG: help configure to find the ELPA F90 modules # HG: help configure to find the ELPA F90 modules
MPSD_ELPA_VERSION=`expr match $MPSD_ELPA_ROOT '.*/elpa-\([0-9.]\+\)'` MPSD_ELPA_VERSION=`expr match $MPSD_ELPA_ROOT '.*/elpa-\([0-9.]\+\)'`
[ -n "$MPSD_ELPA_VERSION" ] && FCFLAGS="$FCFLAGS -I$MPSD_ELPA_ROOT/include/elpa_openmp-$MPSD_ELPA_VERSION/modules" [ -n "$MPSD_ELPA_VERSION" ] && export FCFLAGS_ELPA="-I$MPSD_ELPA_ROOT/include/elpa_openmp-$MPSD_ELPA_VERSION/modules"
export LIBS_ELPA="-L$MPSD_ELPA_ROOT/lib -lelpa_openmp"
# HG: always keep options in the order listed by ``configure --help`` # HG: always keep options in the order listed by ``configure --help``
../configure \ ../configure \
......
octopus/foss2021a-mpi-config.sh
+ 2
− 1
View file @ 003e1f27
...@@ -11,7 +11,8 @@ export LDFLAGS=`echo ${LIBRARY_PATH:+:$LIBRARY_PATH} | sed -e 's/:/ -Wl,-rpath=/ ...@@ -11,7 +11,8 @@ export LDFLAGS=`echo ${LIBRARY_PATH:+:$LIBRARY_PATH} | sed -e 's/:/ -Wl,-rpath=/
# HG: help configure to find the ELPA F90 modules # HG: help configure to find the ELPA F90 modules
MPSD_ELPA_VERSION=`expr match $MPSD_ELPA_ROOT '.*/elpa-\([0-9.]\+\)'` MPSD_ELPA_VERSION=`expr match $MPSD_ELPA_ROOT '.*/elpa-\([0-9.]\+\)'`
[ -n "$MPSD_ELPA_VERSION" ] && FCFLAGS="$FCFLAGS -I$MPSD_ELPA_ROOT/include/elpa_openmp-$MPSD_ELPA_VERSION/modules" [ -n "$MPSD_ELPA_VERSION" ] && export FCFLAGS_ELPA="-I$MPSD_ELPA_ROOT/include/elpa_openmp-$MPSD_ELPA_VERSION/modules"
export LIBS_ELPA="-L$MPSD_ELPA_ROOT/lib -lelpa_openmp"
# HG: always keep options in the order listed by ``configure --help`` # HG: always keep options in the order listed by ``configure --help``
../configure \ ../configure \
......
octopus/foss2021a-serial-config.sh
+ 2
− 1
View file @ 003e1f27
...@@ -11,7 +11,8 @@ export LDFLAGS=`echo ${LIBRARY_PATH:+:$LIBRARY_PATH} | sed -e 's/:/ -Wl,-rpath=/ ...@@ -11,7 +11,8 @@ export LDFLAGS=`echo ${LIBRARY_PATH:+:$LIBRARY_PATH} | sed -e 's/:/ -Wl,-rpath=/
# HG: help configure to find the ELPA F90 modules # HG: help configure to find the ELPA F90 modules
MPSD_ELPA_VERSION=`expr match $MPSD_ELPA_ROOT '.*/elpa-\([0-9.]\+\)'` MPSD_ELPA_VERSION=`expr match $MPSD_ELPA_ROOT '.*/elpa-\([0-9.]\+\)'`
[ -n "$MPSD_ELPA_VERSION" ] && FCFLAGS="$FCFLAGS -I$MPSD_ELPA_ROOT/include/elpa_openmp-$MPSD_ELPA_VERSION/modules" [ -n "$MPSD_ELPA_VERSION" ] && export FCFLAGS_ELPA="-I$MPSD_ELPA_ROOT/include/elpa_openmp-$MPSD_ELPA_VERSION/modules"
export LIBS_ELPA="-L$MPSD_ELPA_ROOT/lib -lelpa_openmp"
# HG: always keep options in the order listed by ``configure --help`` # HG: always keep options in the order listed by ``configure --help``
../configure \ ../configure \
......
octopus/foss2022a-cuda-mpi-config.sh
+ 2
− 1
View file @ 003e1f27
...@@ -11,7 +11,8 @@ export LDFLAGS=`echo ${LIBRARY_PATH:+:$LIBRARY_PATH} | sed -e 's/:/ -Wl,-rpath=/ ...@@ -11,7 +11,8 @@ export LDFLAGS=`echo ${LIBRARY_PATH:+:$LIBRARY_PATH} | sed -e 's/:/ -Wl,-rpath=/
# HG: help configure to find the ELPA F90 modules # HG: help configure to find the ELPA F90 modules
MPSD_ELPA_VERSION=`expr match $MPSD_ELPA_ROOT '.*/elpa-\([0-9.]\+\)'` MPSD_ELPA_VERSION=`expr match $MPSD_ELPA_ROOT '.*/elpa-\([0-9.]\+\)'`
[ -n "$MPSD_ELPA_VERSION" ] && FCFLAGS="$FCFLAGS -I$MPSD_ELPA_ROOT/include/elpa_openmp-$MPSD_ELPA_VERSION/modules" [ -n "$MPSD_ELPA_VERSION" ] && export FCFLAGS_ELPA="-I$MPSD_ELPA_ROOT/include/elpa_openmp-$MPSD_ELPA_VERSION/modules"
export LIBS_ELPA="-L$MPSD_ELPA_ROOT/lib -lelpa_openmp"
# HG: always keep options in the order listed by ``configure --help`` # HG: always keep options in the order listed by ``configure --help``
../configure \ ../configure \
......
octopus/foss2022a-mpi-config.sh
+ 2
− 1
View file @ 003e1f27
...@@ -11,7 +11,8 @@ export LDFLAGS=`echo ${LIBRARY_PATH:+:$LIBRARY_PATH} | sed -e 's/:/ -Wl,-rpath=/ ...@@ -11,7 +11,8 @@ export LDFLAGS=`echo ${LIBRARY_PATH:+:$LIBRARY_PATH} | sed -e 's/:/ -Wl,-rpath=/
# HG: help configure to find the ELPA F90 modules # HG: help configure to find the ELPA F90 modules
MPSD_ELPA_VERSION=`expr match $MPSD_ELPA_ROOT '.*/elpa-\([0-9.]\+\)'` MPSD_ELPA_VERSION=`expr match $MPSD_ELPA_ROOT '.*/elpa-\([0-9.]\+\)'`
[ -n "$MPSD_ELPA_VERSION" ] && FCFLAGS="$FCFLAGS -I$MPSD_ELPA_ROOT/include/elpa_openmp-$MPSD_ELPA_VERSION/modules" [ -n "$MPSD_ELPA_VERSION" ] && export FCFLAGS_ELPA="-I$MPSD_ELPA_ROOT/include/elpa_openmp-$MPSD_ELPA_VERSION/modules"
export LIBS_ELPA="-L$MPSD_ELPA_ROOT/lib -lelpa_openmp"
# HG: always keep options in the order listed by ``configure --help`` # HG: always keep options in the order listed by ``configure --help``
../configure \ ../configure \
......
octopus/foss2022a-serial-config.sh
+ 2
− 1
View file @ 003e1f27
...@@ -11,7 +11,8 @@ export LDFLAGS=`echo ${LIBRARY_PATH:+:$LIBRARY_PATH} | sed -e 's/:/ -Wl,-rpath=/ ...@@ -11,7 +11,8 @@ export LDFLAGS=`echo ${LIBRARY_PATH:+:$LIBRARY_PATH} | sed -e 's/:/ -Wl,-rpath=/
# HG: help configure to find the ELPA F90 modules # HG: help configure to find the ELPA F90 modules
MPSD_ELPA_VERSION=`expr match $MPSD_ELPA_ROOT '.*/elpa-\([0-9.]\+\)'` MPSD_ELPA_VERSION=`expr match $MPSD_ELPA_ROOT '.*/elpa-\([0-9.]\+\)'`
[ -n "$MPSD_ELPA_VERSION" ] && FCFLAGS="$FCFLAGS -I$MPSD_ELPA_ROOT/include/elpa_openmp-$MPSD_ELPA_VERSION/modules" [ -n "$MPSD_ELPA_VERSION" ] && export FCFLAGS_ELPA="-I$MPSD_ELPA_ROOT/include/elpa_openmp-$MPSD_ELPA_VERSION/modules"
export LIBS_ELPA="-L$MPSD_ELPA_ROOT/lib -lelpa_openmp"
# HG: always keep options in the order listed by ``configure --help`` # HG: always keep options in the order listed by ``configure --help``
../configure \ ../configure \
......
spack_setup.sh
+ 0
− 12
View file @ 003e1f27
...@@ -183,23 +183,11 @@ install_missing_terminfo() { ...@@ -183,23 +183,11 @@ install_missing_terminfo() {
done done
} }
elpa_openmp_octopus_workaround() {
local elpa_specs=$(spack find --no-groups --format '{name}@{version}/{hash}' elpa) || return 0
[[ "$elpa_specs" =~ ^[[:alpha:]] ]] || return 0
echo "${C_MSG}#####${C_RESET} adding elpa_openmp octopus workaround for '$elpa_specs'"
local elpa_spec
for elpa_spec in $elpa_specs; do
local lib_dir="$(spack location -i $elpa_spec)/lib/"
[ -e $lib_dir/libelpa.so ] && continue
[ -e $lib_dir/libelpa_openmp.so ] && ln -nsvf $lib_dir/libelpa_openmp.so $lib_dir/libelpa.so
done
}
postprocess_spack_time=0 postprocess_spack_time=0
postprocess_spack() { postprocess_spack() {
local func_start_time=$(time_elapsed 0) local func_start_time=$(time_elapsed 0)
install_missing_terminfo install_missing_terminfo
elpa_openmp_octopus_workaround
update_buildcache update_buildcache
echo "${C_MSG}#####${C_RESET} (Re-)Creating module files" echo "${C_MSG}#####${C_RESET} (Re-)Creating module files"
$color_spack module lmod refresh -y $color_spack module lmod refresh -y
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment