Upgrade mpich and Open MPI

components/mpi-families/mpich/SPECS/mpich.spec

@@ -54,26 +54,19 @@ Requires: libfabric
 
 Summary:   MPICH MPI implementation
 Name:      %{pname}%{RMS_DELIM}%{FABRIC_DELIM}-%{compiler_family}%{PROJ_DELIM}
-Version:   3.4.3
+Version:   4.3.2
 Release:   1%{?dist}
 License:   BSD
 Group:     %{PROJ_NAME}/mpi-families
 URL:       http://www.mpich.org
-Source0:   http://www.mpich.org/static/downloads/%{version}/%{pname}-%{version}.tar.gz
-Patch0:    config.pmix.patch
-# 08/14/19 karl@ices.utexas.edu - upping patch fuzz factor for node.name patch
-%global _default_patch_fuzz 2
+Source0:   https://github.com/pmodels/mpich/releases/download/v%{version}/mpich-%{version}.tar.gz
 
 Requires: prun%{PROJ_DELIM} >= 1.2
 BuildRequires: perl
 Requires: perl
 BuildRequires: zlib-devel make
 BuildRequires: libnl3-devel
-%if 0%{?suse_version}
-BuildRequires:  libnuma-devel
-%else
 BuildRequires: numactl-devel
-%endif
 
 %if "%{RMS_DELIM}" != "%{nil}"
 Provides: %{pname}-%{compiler_family}%{PROJ_DELIM}
@@ -82,10 +75,6 @@ Provides: %{pname}-%{compiler_family}%{PROJ_DELIM}
 Provides: %{pname}-%{compiler_family}%{PROJ_DELIM}
 %endif
 
-%if 0%{?suse_version}
-#!BuildIgnore: post-build-checks
-%endif
-
 # Default library install path
 %define install_path %{OHPC_MPI_STACKS}/%{name}/%version
 
@@ -97,7 +86,6 @@ Message Passing Interface (MPI) standard.
 %prep
 
 %setup -q -n %{pname}-%{version}
-%patch -P 0 -p 0
 
 %build
 # OpenHPC compiler designation
@@ -110,15 +98,6 @@ export CPATH=${PMIX_INC}
 module load ucx
 %endif
 
-%if "%{compiler_family}" == "gnu12" || "%{compiler_family}" == "gnu13" || "%{compiler_family}" == "gnu14" || "%{compiler_family}" == "gnu15"
-# configure fails with:
-#   The Fortran compiler gfortran does not accept programs that
-#   call the same routine with arguments of different types without
-#   the option -fallow-argument-mismatch.
-#   Rerun configure with FFLAGS=-fallow-argument-mismatch
-# This seems to fix the build.
-export FFLAGS=-fallow-argument-mismatch
-%endif
 ./configure --prefix=%{install_path} \
             --libdir=%{install_path}/lib \
 %if "%{compiler_family}" == "intel"
@@ -138,11 +117,6 @@ export FFLAGS=-fallow-argument-mismatch
 %endif
     || { cat config.log && exit 1; }
 
-%if "%{compiler_family}" == "llvm" || "%{compiler_family}" == "arm1"
-%{__sed} -i -e 's#wl=""#wl="-Wl,"#g' libtool
-%{__sed} -i -e 's#pic_flag=""#pic_flag=" -fPIC -DPIC"#g' libtool
-%endif
-
 make V=1 %{?_smp_mflags}
 
 %install
@@ -206,4 +180,3 @@ EOF
 %doc COPYRIGHT
 %doc CHANGES
 %doc README
-%doc RELEASE_NOTES

components/mpi-families/openmpi/SPECS/openmpi.spec

@@ -31,7 +31,7 @@ Summary:   A powerful implementation of MPI/SHMEM
 
 Name:      %{pname}%{RMS_DELIM}-%{compiler_family}%{PROJ_DELIM}
 
-Version:   5.0.8
+Version:   5.0.9
 Release:   1%{?dist}
 License:   BSD-3-Clause
 Group:     %{PROJ_NAME}/mpi-families

tests/ci/spec_to_test_mapping.py

@@ -110,8 +110,8 @@
         "",
         ("lmod-defaults-COMPILER_FAMILY-openmpi5-ohpc man bc"),
     ],
-    "components/mpi-families/openmpi/SPECS/openmpi5.spec": ["slurm", "", ""],
-    "components/mpi-families/mpich/SPECS/mpich.spec": ["slurm", "", ""],
+    "components/mpi-families/openmpi/SPECS/openmpi5.spec": ["mpi", "", ""],
+    "components/mpi-families/mpich/SPECS/mpich.spec": ["mpi", "", ""],
     "components/dev-tools/spack/SPECS/spack.spec": ["", "spack", ""],
     "components/admin/conman/SPECS/conman.spec": ["", "oob", ""],
     "components/dev-tools/autoconf/SPECS/autoconf.spec": [

tests/configure.ac

@@ -1,8 +1,8 @@
 # -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ([2.69])
-AC_INIT([test-suite], [2.0.0], [https://github.com/openhpc/ohpc])
+AC_PREREQ([2.71])
+AC_INIT([test-suite],[2.0.0],[https://github.com/openhpc/ohpc])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([1.14 -Wno-portability])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -510,7 +510,7 @@ AC_ARG_ENABLE([prk],
 AM_CONDITIONAL(PRK_ENABLED,test "x$enable_prk" = "xyes" )
 #------------------------------------------------------------------------------------------
 
-AC_OUTPUT( Makefile 
+AC_CONFIG_FILES([Makefile 
        common/TEST_ENV
        admin/Makefile 
        user-env/Makefile 
@@ -543,7 +543,8 @@ AC_OUTPUT( Makefile
        libs/R/Makefile
        libs/ucx/Makefile
        modules/Makefile
-       time/Makefile )
+       time/Makefile ])
+AC_OUTPUT
 
 echo
 echo '--------------------------------------------- SUMMARY ---------------------------------------------'

tests/mpi/configure.ac

@@ -1,5 +1,5 @@
-AC_PREREQ([2.63])
-AC_INIT([mpi-tests], [0.10.0], [https://github.com/openhpc/ohpc])
+AC_PREREQ([2.71])
+AC_INIT([mpi-tests],[0.10.0],[https://github.com/openhpc/ohpc])
 AM_INIT_AUTOMAKE
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_SUBST([LOG_DRIVER],['$(SHELL) $(top_srcdir)/../test-driver-ohpc'])
@@ -16,7 +16,8 @@ AC_PROG_CC
 AC_PROG_FC
 AC_PROG_CXX
 
-AC_OUTPUT( Makefile tests/Makefile)
+AC_CONFIG_FILES([Makefile tests/Makefile])
+AC_OUTPUT
 
 echo
 echo '-------------------------------------------------- SUMMARY --------------------------------------------------'