From 6b6b6c3837b2481ea7f76442cf6371cd76ea929d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 26 Oct 2024 17:31:22 +0200 Subject: [PATCH 01/10] mpiCheckPhaseHook: disable openmpi's ssh plugin openmpi requires SSH to run. Set flags to run off SSH usage. --- .../setup-hooks/mpi-check-hook/mpi-check-hook.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh b/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh index d7275b62244d..d576df6489d6 100644 --- a/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh +++ b/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh @@ -6,7 +6,6 @@ setupMpiCheck() { # Find out which MPI implementation we are using # and set safe defaults that are guaranteed to run # on any build machine - mpiType="NONE" # OpenMPI signature @@ -41,6 +40,10 @@ setupMpiCheck() { export OMPI_MCA_rmaps_base_oversubscribe=1 export PRTE_MCA_rmaps_default_mapping_policy=node:oversubscribe + # Make sure we do not need openssh in the checkPhase + export OMPI_MCA_plm_ssh_agent=false + export PRRTE_MCA_plm_ssh_agent=false + # Disable CPU pinning export OMPI_MCA_hwloc_base_binding_policy=none export PRTE_MCA_hwloc_default_binding_policy=none From 45aac60b24f1735340e9c776ba8559616510ad9b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 26 Oct 2024 17:41:20 +0200 Subject: [PATCH 02/10] scalapack: remove openssh from checkInputs Is taken care of by mpiCheckPhaseHook --- pkgs/development/libraries/science/math/scalapack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index f7b4ba6738d1..3efd66dff395 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake -, openssh, mpiCheckPhaseHook, mpi, blas, lapack +, mpiCheckPhaseHook, mpi, blas, lapack } : assert blas.isILP64 == lapack.isILP64; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; - nativeCheckInputs = [ openssh mpiCheckPhaseHook ]; + nativeCheckInputs = [ mpiCheckPhaseHook ]; buildInputs = [ blas lapack ]; propagatedBuildInputs = [ mpi ]; hardeningDisable = lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ "stackprotector" ]; From de5f7b922b92bb8188e44a387e5e244ba25baad4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 26 Oct 2024 17:43:55 +0200 Subject: [PATCH 03/10] sirius: remove openssh from checkInputs Is taken care of by mpiCheckPhaseHook --- pkgs/by-name/si/sirius/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/si/sirius/package.nix b/pkgs/by-name/si/sirius/package.nix index d437eece8b21..58c6e6a6dd2e 100644 --- a/pkgs/by-name/si/sirius/package.nix +++ b/pkgs/by-name/si/sirius/package.nix @@ -5,7 +5,6 @@ , pkg-config , mpi , mpiCheckPhaseHook -, openssh , gfortran , blas , lapack @@ -139,7 +138,6 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ mpiCheckPhaseHook - openssh ]; meta = with lib; { From ddd6f3fb1fddc34e058578547299ecc2cbad4e5d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 26 Oct 2024 17:44:44 +0200 Subject: [PATCH 04/10] cp2k: remove openssh from checkInputs Is taken care of by mpiCheckPhaseHook --- pkgs/by-name/cp/cp2k/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/cp/cp2k/package.nix b/pkgs/by-name/cp/cp2k/package.nix index 95c7f0461032..646e9d5aba78 100644 --- a/pkgs/by-name/cp/cp2k/package.nix +++ b/pkgs/by-name/cp/cp2k/package.nix @@ -18,7 +18,6 @@ mpi, gsl, scalapack, - openssh, makeWrapper, libxsmm, spglib, @@ -83,7 +82,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 which - openssh makeWrapper pkg-config ] ++ lib.optional (gpuBackend == "cuda") cudaPackages.cuda_nvcc; @@ -225,7 +223,6 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ mpiCheckPhaseHook - openssh ]; checkPhase = '' From 3e59f77a4f2bc77ad53e2d2db84f222f1a74a513 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 26 Oct 2024 17:45:33 +0200 Subject: [PATCH 05/10] dbcsr: remove openssh from checkInputs Is taken care of by mpiCheckPhaseHook --- pkgs/development/libraries/science/math/dbcsr/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/dbcsr/default.nix b/pkgs/development/libraries/science/math/dbcsr/default.nix index 34f9c4db39cc..e758e1c8fcc2 100644 --- a/pkgs/development/libraries/science/math/dbcsr/default.nix +++ b/pkgs/development/libraries/science/math/dbcsr/default.nix @@ -11,7 +11,6 @@ , python3 , libxsmm , mpi -, openssh }: stdenv.mkDerivation rec { @@ -62,7 +61,6 @@ stdenv.mkDerivation rec { ]; checkInputs = [ - openssh mpiCheckPhaseHook ]; From ce65b23d16bc248428eec484054c4f953f53d55e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 26 Oct 2024 17:47:44 +0200 Subject: [PATCH 06/10] elpa: remove openssh from checkInputs Is taken care of by mpiCheckPhaseHoook --- pkgs/development/libraries/elpa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix index f13b1a167e23..03e6595d1239 100644 --- a/pkgs/development/libraries/elpa/default.nix +++ b/pkgs/development/libraries/elpa/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, autoreconfHook, mpiCheckPhaseHook -, perl, mpi, blas, lapack, scalapack, openssh +, perl, mpi, blas, lapack, scalapack # CPU optimizations , avxSupport ? stdenv.hostPlatform.avxSupport , avx2Support ? stdenv.hostPlatform.avx2Support @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { doCheck = !enableCuda; - nativeCheckInputs = [ mpiCheckPhaseHook openssh ]; + nativeCheckInputs = [ mpiCheckPhaseHook ]; preCheck = '' #patchShebangs ./ From a746d6a411980f1b8fa18ee58a8ce91ab67cc45d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 26 Oct 2024 17:48:08 +0200 Subject: [PATCH 07/10] pythonPackages.mpi4py: remove openssh from checkInputs Is taken care of by mpiCheckPhaseHook --- pkgs/development/python-modules/mpi4py/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 1aba82440888..17d3a46a6fae 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -5,7 +5,6 @@ cython, setuptools, mpi, - openssh, pytestCheckHook, mpiCheckPhaseHook, }: @@ -37,7 +36,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - openssh mpiCheckPhaseHook ]; # Most tests pass, (besides `test_spawn.py`), but when reaching ~80% tests From fb9bbbf9f05051ff133743910abd287ec162ca27 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 26 Oct 2024 17:49:27 +0200 Subject: [PATCH 08/10] petsc: remove openssh from checkInputs Is taken care of by mpiCheckPhaseHook --- pkgs/by-name/pe/petsc/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 8d0db4a768db..ebe5564441ca 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -10,7 +10,6 @@ mpiSupport ? true, mpi, # generic mpi dependency mpiCheckPhaseHook, - openssh, # required for openmpi tests petsc-withp4est ? false, hdf5-support ? false, hdf5, @@ -42,7 +41,7 @@ stdenv.mkDerivation rec { python3 gfortran pkg-config - ] ++ lib.optional mpiSupport mpi ++ lib.optional (mpiSupport && mpi.pname == "openmpi") openssh; + ] ++ lib.optional mpiSupport mpi; buildInputs = [ blas lapack From b8b2c84dda8499acd16fdd8010ebcf5173247238 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 26 Oct 2024 17:49:49 +0200 Subject: [PATCH 09/10] pythonPackages.meep: remove openssh from checkInputs Is taken care of by mpiCheckPhaseHook --- pkgs/development/python-modules/meep/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix index d034595d03e4..8a64d2276c17 100644 --- a/pkgs/development/python-modules/meep/default.nix +++ b/pkgs/development/python-modules/meep/default.nix @@ -18,7 +18,6 @@ harminv, libctl, libGDSII, - openssh, guile, python, numpy, @@ -125,7 +124,6 @@ buildPythonPackage rec { doCheck = true; nativeCheckInputs = [ mpiCheckPhaseHook - openssh ]; checkPhase = '' runHook preCheck From 17277615a77ee1a7e6ee9f228e5ec3935c8cd1b6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 26 Oct 2024 17:50:19 +0200 Subject: [PATCH 10/10] p4est-sc: remove openssh from checkInputs Is taken care of by mpiCheckPhaseHook --- .../libraries/science/math/p4est-sc/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/science/math/p4est-sc/default.nix b/pkgs/development/libraries/science/math/p4est-sc/default.nix index 39b5660494d2..3ac61e5c2b36 100644 --- a/pkgs/development/libraries/science/math/p4est-sc/default.nix +++ b/pkgs/development/libraries/science/math/p4est-sc/default.nix @@ -1,14 +1,13 @@ { lib, stdenv, fetchFromGitHub, mpiCheckPhaseHook , autoreconfHook, pkg-config , p4est-sc-debugEnable ? true, p4est-sc-mpiSupport ? true -, mpi, openssh, zlib +, mpi, zlib }: let dbg = lib.optionalString debugEnable "-dbg"; debugEnable = p4est-sc-debugEnable; mpiSupport = p4est-sc-mpiSupport; - isOpenmpi = mpiSupport && mpi.pname == "openmpi"; in stdenv.mkDerivation { pname = "p4est-sc${dbg}"; @@ -24,9 +23,7 @@ stdenv.mkDerivation { strictDeps = true; nativeBuildInputs = [ autoreconfHook pkg-config ]; - propagatedNativeBuildInputs = lib.optional mpiSupport mpi - ++ lib.optional isOpenmpi openssh - ; + propagatedNativeBuildInputs = lib.optional mpiSupport mpi ; propagatedBuildInputs = [ zlib ]; inherit debugEnable mpiSupport; @@ -49,7 +46,6 @@ stdenv.mkDerivation { nativeCheckInputs = lib.optionals mpiSupport [ mpiCheckPhaseHook - openssh ]; # disallow Darwin checks due to prototype incompatibility of qsort_r