Compare commits

..

1 commit

Author SHA1 Message Date
Cristian Le
6d08ed711f Added CMAKE_PREFIX_PATH to the module file
... to unsure that CMake projects find the available MPI enabled
packages, libraries, executables, etc.

The motivation is that CMake projects will search first in the
CMAKE_PREFIX_PATH, both for cmake specific files like <Package>Config.cmake as
well as libraries and header files in general. Adding this variable is crucial
to making sure that the MPI versions take precedence over the serial versions.

(cherry picked from commit a9297c32c6)
2024-02-12 14:50:34 +01:00
4 changed files with 8 additions and 11 deletions

2
.gitignore vendored
View file

@ -13,5 +13,3 @@
/mpich-4.1.tar.gz
/mpich-4.1.1.tar.gz
/mpich-4.1.2.tar.gz
/mpich-4.2.1.tar.gz
/mpich-4.2.2.tar.gz

View file

@ -11,7 +11,7 @@ diff --git a/src/packaging/envmods/mpich.module.in b/src/packaging/envmods/mpich
index 3d6b4fa623..b8283274ee 100644
--- a/src/packaging/envmods/mpich.module.in
+++ b/src/packaging/envmods/mpich.module.in
@@ -3,12 +3,24 @@
@@ -3,12 +3,23 @@
# MPICH module for use with 'environment-modules' package:
#

View file

@ -1,6 +1,6 @@
Summary: A high-performance implementation of MPI
Name: mpich
Version: 4.2.2
Version: 4.1.2
Release: %autorelease
License: mpich2
URL: https://www.mpich.org/
@ -29,6 +29,7 @@ BuildRequires: gcc-gfortran
BuildRequires: hwloc-devel >= 2.0
%if ! (0%{?rhel} >= 10)
%ifarch x86_64
BuildRequires: infinipath-psm-devel
# BuildRequires: json-c-devel
BuildRequires: libpsm2-devel
%endif
@ -37,7 +38,7 @@ BuildRequires: libfabric-devel
BuildRequires: libnl3-devel
BuildRequires: libuuid-devel
BuildRequires: numactl-devel
%ifarch aarch64 ppc64le x86_64 riscv64
%ifarch aarch64 ppc64le x86_64
BuildRequires: ucx-devel
%endif
%if ! 0%{?rhel}
@ -47,7 +48,7 @@ Provides: bundled(yaksa) = 0.2
%endif
# For ./maint/extractcvars
BuildRequires: perl(lib)
%ifarch %{valgrind_arches}
%ifnarch s390 %{mips}
BuildRequires: valgrind-devel
%endif
# For %%{python3_sitearch}
@ -151,7 +152,7 @@ CONFIGURE_OPTS=(
--htmldir=%{_datadir}/%{name}/doc
--with-hwloc
--with-libfabric
%ifarch aarch64 ppc64le x86_64 riscv64
%ifarch aarch64 ppc64le x86_64
--with-ucx
%endif
%if ! 0%{?rhel}
@ -217,9 +218,6 @@ mkdir -p %{buildroot}%{_libdir}/%{name}/include
find %{buildroot} -type f -name "*.la" -delete
rm %{buildroot}%{_libdir}/%{name}/bin/parkill
%check
make check VERBOSE=1 \
%ifarch ppc64le
@ -247,6 +245,7 @@ make check VERBOSE=1 \
%{_libdir}/%{name}/bin/mpiexec*
%{_libdir}/%{name}/bin/mpirun
%{_libdir}/%{name}/bin/mpivars
%{_libdir}/%{name}/bin/parkill
%dir %{_mandir}/%{name}-%{_arch}
%doc %{_mandir}/%{name}-%{_arch}/man1/
%{_datadir}/modulefiles/mpi/

View file

@ -1 +1 @@
SHA512 (mpich-4.2.2.tar.gz) = 706b1f008a4da3bc44b9c8191e20031983eed7d82aadeac8cf4b2c7ffbe5c5ec88c047f7a826e3a0a7e076799e03cceec908853eec89f651de50301af619e757
SHA512 (mpich-4.1.2.tar.gz) = d1056374ef9ecb6d7816637b6709497e5bc63c3b0af8dfef461aa71a59f9f805b07d80a735eb1511748e78a9260ed967b0597e64a935850fcba1dfef7bf43775