From 7262ee3118584d8ab1ec57c9f5821df4591f20eb Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 4 Oct 2024 11:04:18 +0200 Subject: [PATCH 1/3] mpich: 4.2.2 -> 4.2.3 --- pkgs/development/libraries/mpich/default.nix | 16 ++++++++++++---- .../libraries/mpich/disable-romio-tests.patch | 13 +++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/mpich/disable-romio-tests.patch diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index 4af559b50758..1e162cb325ea 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, perl, gfortran +{ stdenv, lib, fetchurl, perl, gfortran, automake, autoconf , openssh, hwloc, python3 , darwin # either libfabric or ucx work for ch4backend on linux. On darwin, neither of @@ -21,13 +21,21 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric"); stdenv.mkDerivation rec { pname = "mpich"; - version = "4.2.2"; + version = "4.2.3"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - sha256 = "sha256-iD9bs66r9ifLhJLKAqA7GR0Jg2u+D1mdhQg1EXl4HUE="; + hash = "sha256-egGRgMUdFzitnF2NRSMU3mXoKO4kC8stH4DemmW+iKg="; }; + patches = [ + # Disables ROMIO test which was enabled in + # https://github.com/pmodels/mpich/commit/09686f45d77b7739f7aef4c2c6ef4c3060946595 + # The test searches for mpicc in $out/bin, which is not yet present in the checkPhase + # Moreover it fails one test. + ./disable-romio-tests.patch + ]; + outputs = [ "out" "doc" "man" ]; configureFlags = [ @@ -42,7 +50,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ gfortran python3 ]; + nativeBuildInputs = [ gfortran python3 autoconf automake ]; buildInputs = [ perl openssh hwloc ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) ch4backend ++ lib.optional pmixSupport pmix diff --git a/pkgs/development/libraries/mpich/disable-romio-tests.patch b/pkgs/development/libraries/mpich/disable-romio-tests.patch new file mode 100644 index 000000000000..2a4cd96aee69 --- /dev/null +++ b/pkgs/development/libraries/mpich/disable-romio-tests.patch @@ -0,0 +1,13 @@ +diff --git a/src/mpi/romio/Makefile.am b/src/mpi/romio/Makefile.am +index a6429766f..658f1c563 100644 +--- a/src/mpi/romio/Makefile.am ++++ b/src/mpi/romio/Makefile.am +@@ -56,7 +56,7 @@ nodist_include_HEADERS += include/mpio.h include/mpiof.h + + # ------------------------------------------------------------------------ + +-SUBDIRS = $(external_subdirs) . test ++SUBDIRS = $(external_subdirs) + DIST_SUBDIRS = test test-internal $(external_dist_subdirs) + + # for the sake of parallel make and avoiding an excessive number of convenience From f89715531c3ed403e873f292d41e4436747db68e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 4 Oct 2024 11:33:36 +0200 Subject: [PATCH 2/3] mpich: apply nixfmt --- pkgs/development/libraries/mpich/default.nix | 83 +++++++++++++------- 1 file changed, 56 insertions(+), 27 deletions(-) diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index 1e162cb325ea..fb929cefa540 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -1,17 +1,29 @@ -{ stdenv, lib, fetchurl, perl, gfortran, automake, autoconf -, openssh, hwloc, python3 -, darwin -# either libfabric or ucx work for ch4backend on linux. On darwin, neither of -# these libraries currently build so this argument is ignored on Darwin. -, ch4backend -# Process managers to build (`--with-pm`), -# cf. https://github.com/pmodels/mpich/blob/b80a6d7c24defe7cdf6c57c52430f8075a0a41d6/README.vin#L562-L586 -, withPm ? [ "hydra" "gforker" ] -, pmix -# PMIX support is likely incompatible with process managers (`--with-pm`) -# https://github.com/NixOS/nixpkgs/pull/274804#discussion_r1432601476 -, pmixSupport ? false -} : +{ + stdenv, + lib, + fetchurl, + perl, + gfortran, + automake, + autoconf, + openssh, + hwloc, + python3, + darwin, + # either libfabric or ucx work for ch4backend on linux. On darwin, neither of + # these libraries currently build so this argument is ignored on Darwin. + ch4backend, + # Process managers to build (`--with-pm`), + # cf. https://github.com/pmodels/mpich/blob/b80a6d7c24defe7cdf6c57c52430f8075a0a41d6/README.vin#L562-L586 + withPm ? [ + "hydra" + "gforker" + ], + pmix, + # PMIX support is likely incompatible with process managers (`--with-pm`) + # https://github.com/NixOS/nixpkgs/pull/274804#discussion_r1432601476 + pmixSupport ? false, +}: let withPmStr = if withPm != [ ] then builtins.concatStringsSep ":" withPm else "no"; @@ -19,7 +31,7 @@ in assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric"); -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "mpich"; version = "4.2.3"; @@ -36,22 +48,39 @@ stdenv.mkDerivation rec { ./disable-romio-tests.patch ]; - outputs = [ "out" "doc" "man" ]; - - configureFlags = [ - "--enable-shared" - "--with-pm=${withPmStr}" - ] ++ lib.optionals (lib.versionAtLeast gfortran.version "10") [ - "FFLAGS=-fallow-argument-mismatch" # https://github.com/pmodels/mpich/issues/4300 - "FCFLAGS=-fallow-argument-mismatch" - ] ++ lib.optionals pmixSupport [ - "--with-pmix" + outputs = [ + "out" + "doc" + "man" ]; + configureFlags = + [ + "--enable-shared" + "--with-pm=${withPmStr}" + ] + ++ lib.optionals (lib.versionAtLeast gfortran.version "10") [ + "FFLAGS=-fallow-argument-mismatch" # https://github.com/pmodels/mpich/issues/4300 + "FCFLAGS=-fallow-argument-mismatch" + ] + ++ lib.optionals pmixSupport [ + "--with-pmix" + ]; + enableParallelBuilding = true; - nativeBuildInputs = [ gfortran python3 autoconf automake ]; - buildInputs = [ perl openssh hwloc ] + nativeBuildInputs = [ + gfortran + python3 + autoconf + automake + ]; + buildInputs = + [ + perl + openssh + hwloc + ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) ch4backend ++ lib.optional pmixSupport pmix ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Foundation; From 37974f025b3d34ee2158ae28d957adb7501900b3 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 4 Oct 2024 11:35:39 +0200 Subject: [PATCH 3/3] mpich: remove "with lib" from meta --- pkgs/development/libraries/mpich/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index fb929cefa540..a01cc726f223 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { sed -i 's:FC="gfortran":FC=${gfortran}/bin/gfortran:' $out/bin/mpifort ''; - meta = with lib; { + meta = { # As far as we know, --with-pmix silently disables all of `--with-pm` broken = pmixSupport && withPm != [ ]; @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { url = "http://git.mpich.org/mpich.git/blob/a385d6d0d55e83c3709ae851967ce613e892cd21:/COPYRIGHT"; fullName = "MPICH license (permissive)"; }; - maintainers = [ maintainers.markuskowa ]; - platforms = platforms.linux ++ platforms.darwin; + maintainers = [ lib.maintainers.markuskowa ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }