elpa: use mpiCheckPhaseHook

This commit is contained in:
Markus Kowalewski 2023-08-02 23:17:57 +02:00
parent ac48985e0d
commit 32db66c9f5

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, autoreconfHook, gfortran, perl { lib, stdenv, fetchurl, autoreconfHook, mpiCheckPhaseHook
, mpi, blas, lapack, scalapack, openssh , gfortran, perl, mpi, blas, lapack, scalapack, openssh
# CPU optimizations # CPU optimizations
, avxSupport ? stdenv.hostPlatform.avxSupport , avxSupport ? stdenv.hostPlatform.avxSupport
, avx2Support ? stdenv.hostPlatform.avx2Support , avx2Support ? stdenv.hostPlatform.avx2Support
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile.am --replace '#!/bin/bash' '#!${stdenv.shell}' substituteInPlace Makefile.am --replace '#!/bin/bash' '#!${stdenv.shell}'
''; '';
nativeBuildInputs = [ autoreconfHook perl openssh ]; nativeBuildInputs = [ autoreconfHook perl ];
buildInputs = [ mpi blas lapack scalapack ] buildInputs = [ mpi blas lapack scalapack ]
++ lib.optional enableCuda cudatoolkit; ++ lib.optional enableCuda cudatoolkit;
@ -76,15 +76,10 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
nativeCheckInputs = [ mpiCheckPhaseHook openssh ];
preCheck = '' preCheck = ''
#patchShebangs ./ #patchShebangs ./
# make sure the test starts even if we have less than 4 cores
export OMPI_MCA_rmaps_base_oversubscribe=1
# Fix to make mpich run in a sandbox
export HYDRA_IFACE=lo
# Run dual threaded # Run dual threaded
export OMP_NUM_THREADS=2 export OMP_NUM_THREADS=2