Unverified Commit 17aacfb6 authored by Markus Kowalewski's avatar Markus Kowalewski Committed by GitHub
Browse files

mpiCheckPhaseHook: disable openmpi's ssh plugin (#351473)

parents 4716adae 17277615

pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh

+4 −1
Original line number Diff line number Diff line
@@ -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

pkgs/by-name/cp/cp2k/package.nix

+0 −3
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/by-name/pe/petsc/package.nix

+1 −2
Original line number Diff line number Diff line
@@ -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

pkgs/by-name/si/sirius/package.nix

+0 −2
Original line number Diff line number Diff line
@@ -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; {

pkgs/development/libraries/elpa/default.nix

+2 −2
Original line number Diff line number Diff line 
{ 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 ./