rpms/fftw
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix building with no MPI types enabled

Browse Source 
If both mpich and openmpi are not used (via --without options) the build
fails.  The list of mpi types is undefined in this case, and it is not
referenced correctly to be treated as an empty list.

Signed-off-by: Trent Piepho <tpiepho@gmail.com>
This commit is contained in:
Trent Piepho 2022-11-27 12:30:23 -08:00
parent a38e99cafd
commit 9c4cca7ca2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fftw.spec
View File

@ -329,7 +329,7 @@ for ((iprec=0; iprec<%{nprec}; iprec++)) ; do
done done
# MPI Builds - this duplicates the non-mpi builds, but oh well # MPI Builds - this duplicates the non-mpi builds, but oh well
for mpi in %{mpi_list} ; do for mpi in %{?mpi_list} ; do
module load mpi/${mpi}-%{_arch} module load mpi/${mpi}-%{_arch}
# Loop over precisions - no quad precision support with MPI # Loop over precisions - no quad precision support with MPI
for((iprec=0;iprec<%{nmpiprec};iprec++)) ; do for((iprec=0;iprec<%{nmpiprec};iprec++)) ; do
@ -367,7 +367,7 @@ for((iprec=0;iprec<%{nprec};iprec++)) ; do
done done
# MPI # MPI
for mpi in %{mpi_list} ; do for mpi in %{?mpi_list} ; do
module load mpi/${mpi}-%{_arch} module load mpi/${mpi}-%{_arch}
for((iprec=0;iprec<%{nmpiprec};iprec++)) ; do for((iprec=0;iprec<%{nmpiprec};iprec++)) ; do
%make_install -C ${mpi}-${prec_name[iprec]} %make_install -C ${mpi}-${prec_name[iprec]}
@ -396,7 +396,7 @@ done
# MPI # MPI
# Allow oversubscription with openmpi # Allow oversubscription with openmpi
export OMPI_MCA_rmaps_base_oversubscribe=1 export OMPI_MCA_rmaps_base_oversubscribe=1
for mpi in %{mpi_list} ; do for mpi in %{?mpi_list} ; do
module load mpi/${mpi}-%{_arch} module load mpi/${mpi}-%{_arch}
for((iprec=0;iprec<%{nmpiprec};iprec++)) ; do for((iprec=0;iprec<%{nmpiprec};iprec++)) ; do
export LD_LIBRARY_PATH=$bdir/${prec_name[iprec]}/.libs:$bdir/${prec_name[iprec]}/threads/.libs export LD_LIBRARY_PATH=$bdir/${prec_name[iprec]}/.libs:$bdir/${prec_name[iprec]}/threads/.libs
@ -529,6 +529,7 @@ done
- Enable NEON on aarch64 - Enable NEON on aarch64
- Clean up precision list - Clean up precision list
- Fix for OpenMPI build with < 4 processors - Fix for OpenMPI build with < 4 processors
- Fix building with no enabled MPI types
* Thu Mar 02 2023 Orion Poplawski <orion@nwra.com> - 3.3.10-5 * Thu Mar 02 2023 Orion Poplawski <orion@nwra.com> - 3.3.10-5
- Use make macros - Use make macros