import rpm-mpi-hooks-8-2.el8
This commit is contained in:
parent
0e8f00c1e9
commit
9b6a0ff391
@ -27,8 +27,7 @@ if [ ! -d "$buildroot" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Remaining arguments are passed to elfdeps
|
||||
shift
|
||||
# Arguments are passed to elfdeps
|
||||
elfdepsargs="$@"
|
||||
|
||||
# Search for all MPI implementations:
|
||||
@ -46,24 +45,16 @@ if [ -e /etc/profile.d/modules.sh ]; then
|
||||
done
|
||||
export MODULEPATH="$MODULEPATH:$(IFS=:; echo "${_MODULEPATH[*]}")"
|
||||
|
||||
for module in $(module -t avail 2>&1 | grep "^mpi/"); do
|
||||
for module in $(module -t avail 2>&1 | grep "^mpi/." | sed "s/(default)$//"); do
|
||||
module load $module
|
||||
if [ -z "${MPI_COMPILER}" ]; then
|
||||
>&2 echo "Invalid module file, no MPI_COMPILER defined"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${MPI_HOME}" ]; then
|
||||
>&2 echo "Invalid module file, no MPI_HOME defined"
|
||||
exit 1
|
||||
fi
|
||||
mpi_compiler_for_dir[${MPI_HOME}]=${MPI_COMPILER}
|
||||
if [ ! -z "${MPI_FORTRAN_MOD_DIR}" ]; then
|
||||
mpi_compiler_for_dir[${MPI_FORTRAN_MOD_DIR}]=${MPI_COMPILER}
|
||||
fi
|
||||
if [ ! -z "${MPI_PYTHON2_SITEARCH}" ]; then
|
||||
mpi_compiler_for_dir[${MPI_FORTRAN_MOD_DIR}]=${MPI_COMPILER}
|
||||
if [ -n "${MPI_PYTHON2_SITEARCH}" ]; then
|
||||
mpi_compiler_for_dir[${MPI_PYTHON2_SITEARCH}]=${MPI_COMPILER}
|
||||
elif [ -n "${MPI_PYTHON_SITEARCH}" ]; then
|
||||
mpi_compiler_for_dir[${MPI_PYTHON_SITEARCH}]=${MPI_COMPILER}
|
||||
fi
|
||||
if [ ! -z "${MPI_PYTHON3_SITEARCH}" ]; then
|
||||
if [ -n "${MPI_PYTHON3_SITEARCH}" ]; then
|
||||
mpi_compiler_for_dir[${MPI_PYTHON3_SITEARCH}]=${MPI_COMPILER}
|
||||
fi
|
||||
module unload $module
|
||||
|
@ -27,8 +27,7 @@ if [ ! -d "$buildroot" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Remaining arguments are passed to elfdeps
|
||||
shift
|
||||
# Arguments are passed to elfdeps
|
||||
elfdepsargs="$@"
|
||||
|
||||
# Search for all MPI implementations:
|
||||
@ -48,31 +47,19 @@ if [ -e /etc/profile.d/modules.sh ]; then
|
||||
done
|
||||
export MODULEPATH="$MODULEPATH:$(IFS=:; echo "${_MODULEPATH[*]}")"
|
||||
|
||||
for module in $(module -t avail 2>&1 | grep "^mpi/"); do
|
||||
for module in $(module -t avail 2>&1 | grep "^mpi/." | sed "s/(default)$//"); do
|
||||
module load $module
|
||||
if [ -z "${MPI_COMPILER}" ]; then
|
||||
>&2 echo "Invalid module file, no MPI_COMPILER defined"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${MPI_HOME}" ]; then
|
||||
>&2 echo "Invalid module file, no MPI_HOME defined"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${MPI_LIB}" ]; then
|
||||
>&2 echo "Invalid module file, no MPI_LIB defined"
|
||||
exit 1
|
||||
fi
|
||||
mpi_compiler_for_dir[${MPI_HOME}]=${MPI_COMPILER}
|
||||
mpi_lib_for_compiler[${MPI_COMPILER}]=${MPI_LIB}
|
||||
if [ ! -z "${MPI_FORTRAN_MOD_DIR}" ]; then
|
||||
mpi_compiler_for_dir[${MPI_FORTRAN_MOD_DIR}]=${MPI_COMPILER}
|
||||
fi
|
||||
if [ ! -z "${MPI_PYTHON2_SITEARCH}" ]; then
|
||||
mpi_compiler_for_dir[${MPI_FORTRAN_MOD_DIR}]=${MPI_COMPILER}
|
||||
if [ -n "${MPI_PYTHON2_SITEARCH}" ]; then
|
||||
mpi_compiler_for_dir[${MPI_PYTHON2_SITEARCH}]=${MPI_COMPILER}
|
||||
elif [ -n "${MPI_PYTHON_SITEARCH}" ]; then
|
||||
mpi_compiler_for_dir[${MPI_PYTHON_SITEARCH}]=${MPI_COMPILER}
|
||||
fi
|
||||
if [ ! -z "${MPI_PYTHON3_SITEARCH}" ]; then
|
||||
if [ -n "${MPI_PYTHON3_SITEARCH}" ]; then
|
||||
mpi_compiler_for_dir[${MPI_PYTHON3_SITEARCH}]=${MPI_COMPILER}
|
||||
fi
|
||||
mpi_lib_for_compiler[${MPI_COMPILER}]=${MPI_LIB}
|
||||
module unload $module
|
||||
done
|
||||
fi
|
||||
|
@ -1,6 +1,6 @@
|
||||
Name: rpm-mpi-hooks
|
||||
Version: 5
|
||||
Release: 4%{?dist}
|
||||
Version: 8
|
||||
Release: 2%{?dist}
|
||||
Summary: RPM dependency generator hooks for MPI packages
|
||||
|
||||
License: MIT
|
||||
@ -46,6 +46,14 @@ install -Dpm 0755 %{SOURCE3} %{buildroot}%{_rpmconfigdir}/mpi.req
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue May 18 2021 Honggang Li <honli@redhat.com> - 8-2
|
||||
- Rebuilt after building tool chain update
|
||||
- Resolves: rhbz#1924665
|
||||
|
||||
* Wed Apr 07 2021 Honggang Li <honli@redhat.com> - 8-1
|
||||
- Sync with latest Fedora repo
|
||||
- Resolves: rhbz#1924665
|
||||
|
||||
* Thu Sep 13 2018 Jarod Wilson <jarod@redhat.com> - 5-4
|
||||
- Make hooks more resilient to missing info
|
||||
- Error out with a useful message when necessary info isn't there
|
||||
|
Loading…
Reference in New Issue
Block a user