diff options
author | Nikolay Amiantov <ab@fmap.me> | 2019-06-02 20:11:58 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2019-06-02 21:50:06 +0300 |
commit | 1deb406ac2721478af120261a51b2fa44321744a (patch) | |
tree | d845def985f64e13931c3da517b919014752e227 /pkgs/applications/science/math | |
parent | c534d5c865882b45479fbff3d8a529c2396f758e (diff) | |
download | nixlib-1deb406ac2721478af120261a51b2fa44321744a.tar nixlib-1deb406ac2721478af120261a51b2fa44321744a.tar.gz nixlib-1deb406ac2721478af120261a51b2fa44321744a.tar.bz2 nixlib-1deb406ac2721478af120261a51b2fa44321744a.tar.lz nixlib-1deb406ac2721478af120261a51b2fa44321744a.tar.xz nixlib-1deb406ac2721478af120261a51b2fa44321744a.tar.zst nixlib-1deb406ac2721478af120261a51b2fa44321744a.zip |
mxnet: 1.2.1 -> 1.4.1
Diffstat (limited to 'pkgs/applications/science/math')
-rw-r--r-- | pkgs/applications/science/math/mxnet/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 9c1a2e202823..e2e4ba63b07e 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchurl, bash, cmake -, opencv, gtest, openblas, liblapack, perl +, opencv3, gtest, openblas, liblapack, perl , cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11 , cudnnSupport ? cudaSupport, cudnn }: @@ -8,24 +8,22 @@ assert cudnnSupport -> cudaSupport; stdenv.mkDerivation rec { name = "mxnet-${version}"; - version = "1.2.1"; + version = "1.4.1"; - # Fetching from git does not work at the time (1.2.1) due to an - # incorrect hash in one of the submodules. The provided tarballs - # contain all necessary sources. src = fetchurl { url = "https://github.com/apache/incubator-mxnet/releases/download/${version}/apache-mxnet-src-${version}-incubating.tar.gz"; - sha256 = "053zbdgs4j8l79ipdz461zc7wyfbfcflmi5bw7lj2q08zm1glnb2"; + sha256 = "1d0lhlpdaxycjzpwwrpgjd3v2q2ka89v5rr13ddxayy7ld2hxiaj"; }; nativeBuildInputs = [ cmake perl ]; - buildInputs = [ opencv gtest openblas liblapack ] + buildInputs = [ opencv3 gtest openblas liblapack ] ++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ] ++ lib.optional cudnnSupport cudnn; cmakeFlags = - (if cudaSupport then [ + [ "-DUSE_MKL_IF_AVAILABLE=OFF" ] + ++ (if cudaSupport then [ "-DUSE_OLDCMAKECUDA=ON" # see https://github.com/apache/incubator-mxnet/issues/10743 "-DCUDA_ARCH_NAME=All" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" |