diff options
Diffstat (limited to 'pkgs/applications/science/math')
-rw-r--r-- | pkgs/applications/science/math/cntk/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/science/math/getdp/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/math/scotch/default.nix | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index a348210179e..e15e2a43d77 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, fetchFromGitHub, cmake -, openblas, blas, lapack, opencv3, libzip, boost, protobuf, openmpi +, openblas, blas, lapack, opencv3, libzip, boost, protobuf, mpi , onebitSGDSupport ? false , cudaSupport ? false, addOpenGLRunpath, cudatoolkit, nvidia_x11 , cudnnSupport ? cudaSupport, cudnn @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { # Force OpenMPI to use g++ in PATH. OMPI_CXX = "g++"; - buildInputs = [ openblas opencv3 libzip boost protobuf openmpi ] + buildInputs = [ openblas opencv3 libzip boost protobuf mpi ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional cudnnSupport cudnn; @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { "--with-openblas=${openblas}" "--with-boost=${boost.dev}" "--with-protobuf=${protobuf}" - "--with-mpi=${openmpi}" + "--with-mpi=${mpi}" "--cuda=${if cudaSupport then "yes" else "no"}" # FIXME "--asgd=no" diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/applications/science/math/getdp/default.nix index 915c7e1147f..39d9c866cae 100644 --- a/pkgs/applications/science/math/getdp/default.nix +++ b/pkgs/applications/science/math/getdp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, gfortran, blas, lapack, openmpi, petsc, python3 }: +{ lib, stdenv, fetchurl, cmake, gfortran, blas, lapack, mpi, petsc, python3 }: stdenv.mkDerivation rec { name = "getdp-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake gfortran ]; - buildInputs = [ blas lapack openmpi petsc python3 ]; + buildInputs = [ blas lapack mpi petsc python3 ]; meta = with lib; { description = "A General Environment for the Treatment of Discrete Problems"; diff --git a/pkgs/applications/science/math/scotch/default.nix b/pkgs/applications/science/math/scotch/default.nix index 6f8753ff38a..b6613f25cbc 100644 --- a/pkgs/applications/science/math/scotch/default.nix +++ b/pkgs/applications/science/math/scotch/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, bison, openmpi, flex, zlib}: +{ lib, stdenv, fetchurl, bison, mpi, flex, zlib}: stdenv.mkDerivation rec { version = "6.0.4"; pname = "scotch"; src_name = "scotch_${version}"; - buildInputs = [ bison openmpi flex zlib ]; + buildInputs = [ bison mpi flex zlib ]; src = fetchurl { url = "https://gforge.inria.fr/frs/download.php/file/34618/${src_name}.tar.gz"; |