Commit b3f8d277 authored by gsell's avatar gsell

Merge branch '58-openmpi-bugfixes-in-build-script' into 'master'

Resolve "openmpi: bugfixes in build-script"

Closes #58

See merge request Pmodules/buildblocks!72
parents f88f30cf a089d9a4
......@@ -24,7 +24,9 @@ pbuild::pre_configure() {
pbuild::add_configure_args "--enable-static"
pbuild::add_configure_args "--with-sge=yes"
pbuild::add_configure_args "--with-slurm=yes"
if (( V_MAJOR < 4 )); then
local version
(( version = (${V_MAJOR} * 100 + ${V_MINOR}) * 100 + V_PATCHLVL ))
if (( version < 30104 )) ; then
pbuild::add_configure_args "--enable-mpi-f90"
pbuild::add_configure_args "--enable-mpi-profile"
pbuild::add_configure_args "--enable-smp-locks"
......@@ -34,13 +36,10 @@ pbuild::pre_configure() {
}
pbuild::post_install() {
if [[ -r /usr/lib64/libnuma.so ]]; then
cp -av /usr/lib64/libnuma.so.* "${PREFIX}/lib/fallback"
fi
if [[ -r /usr/lib64/libibverbs.so ]]; then
cp -av /usr/lib64/libibverbs.so.* "${PREFIX}/lib/fallback"
fi
if [[ -r /usr/lib64/librdmacm.so ]]; then
cp -av /usr/lib64/librdmacm.so.* "${PREFIX}/lib/fallback"
fi
mkdir -p "${PREFIX}/lib/fallback"
local -r binary=$(ls "${PREFIX}"/lib/libmpi.so.*.*.*)
pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/usr/.*/libuc[mpst].so'
pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/usr/.*/libnuma.so'
pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/usr/.*/libbverbs.so'
pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/usr/.*/librdmacm.so'
}
......@@ -28,8 +28,9 @@ setenv MPIRUN $PREFIX/bin/mpirun
set libibverbs [glob -nocomplain /usr/lib{64,}/libibverbs.so.1*]
set libnuma [glob -nocomplain /usr/lib{64,}/libnuma.so.1*]
set librdmacm [glob -nocomplain /usr/lib{64,}/librdmacm.so.1*]
set libucx [glob -nocomplain /usr/lib{64,}/libuc[mpst].so.0*]
if { $libibverbs eq "" || $libnuma eq "" || $librdmacm eq "" } {
if { $libibverbs eq "" || $libnuma eq "" || $librdmacm eq "" || $libucx eq "" } {
if { [file isdirectory $PREFIX/lib/fallback] } {
prepend-path LD_LIBRARY_PATH $PREFIX/lib/fallback
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment