Filter default from available modules (#1945041)

This commit is contained in:
Sandro Mani 2021-03-31 11:47:54 +02:00
parent 44dbc1d59e
commit 55b26a2f68
3 changed files with 6 additions and 3 deletions

View File

@ -45,7 +45,7 @@ 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
mpi_compiler_for_dir[${MPI_HOME}]=${MPI_COMPILER}
mpi_compiler_for_dir[${MPI_FORTRAN_MOD_DIR}]=${MPI_COMPILER}

View File

@ -47,7 +47,7 @@ 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
mpi_compiler_for_dir[${MPI_HOME}]=${MPI_COMPILER}
mpi_compiler_for_dir[${MPI_FORTRAN_MOD_DIR}]=${MPI_COMPILER}

View File

@ -1,5 +1,5 @@
Name: rpm-mpi-hooks
Version: 7
Version: 8
Release: 1%{?dist}
Summary: RPM dependency generator hooks for MPI packages
@ -46,6 +46,9 @@ install -Dpm 0755 %{SOURCE3} %{buildroot}%{_rpmconfigdir}/mpi.req
%changelog
* Wed Mar 31 2021 Sandro Mani <manisandro@gmail.com> - 8-1
- Filter default from available modules (#1945041)
* Thu Feb 18 2021 Sandro Mani <manisandro@gmail.com> 7-1
- Fix left-over argument shift in mpi.prov and mpi.req (#1930096)