cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

mxnet: fix for gcc10+, enable on darwin

Browse source
This commit is contained in:
Dmitry Kalinkin 2021-11-27 22:11:09 -05:00
parent ea469c7eb1
commit b39504da72
No known key found for this signature in database
GPG key ID: 5157B3EC8B2CA333
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/applications/science/math/mxnet/default.nix
View file

@ -1,5 +1,5 @@
{ config, stdenv, lib, fetchurl, bash, cmake { config, stdenv, lib, fetchurl, fetchpatch, bash, cmake
, opencv3, gtest, blas, perl , opencv3, gtest, blas, gomp, llvmPackages, perl
, cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11 , cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11
, cudnnSupport ? cudaSupport, cudnn , cudnnSupport ? cudaSupport, cudnn
}: }:
@ -15,11 +15,27 @@ stdenv.mkDerivation rec {
sha256 = "1vvdb7pfh63kb9fzs6gqp95q550a3ck4cj9mqxlk9wwhkh30dsq1"; sha256 = "1vvdb7pfh63kb9fzs6gqp95q550a3ck4cj9mqxlk9wwhkh30dsq1";
}; };
patches = [
# Fix build error https://github.com/apache/incubator-mxnet/issues/19405
(fetchpatch {
name = "mxnet-fix-gcc-linker-error-1.patch";
url = "https://github.com/apache/incubator-mxnet/commit/78e31d66d19e385ca4ef73245ce79a47e375d8d1.diff";
sha256 = "sha256-UfmGhh4RbvrEOXe6IJxHm1Aqpy1gS6gHxrX5KQBXjv4=";
})
(fetchpatch {
name = "mxnet-fix-gcc-linker-error-2.patch";
url = "https://github.com/apache/incubator-mxnet/commit/9bfe3116aabd01049fdbd90855cb245a30b795df.diff";
sha256 = "sha256-BL7Zf7Bgn0qpai9HbQ6LBxZNa3iLjVJSe5nxZgqI/fw=";
})
];
nativeBuildInputs = [ cmake perl ]; nativeBuildInputs = [ cmake perl ];
buildInputs = [ opencv3 gtest blas.provider ] buildInputs = [ opencv3 gtest blas.provider ]
++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ] ++ lib.optional stdenv.cc.isGNU gomp
++ lib.optional cudnnSupport cudnn; ++ lib.optional stdenv.cc.isClang llvmPackages.openmp
++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ]
++ lib.optional cudnnSupport cudnn;
cmakeFlags = cmakeFlags =
[ "-DUSE_MKL_IF_AVAILABLE=OFF" ] [ "-DUSE_MKL_IF_AVAILABLE=OFF" ]
@ -48,6 +64,6 @@ stdenv.mkDerivation rec {
homepage = "https://mxnet.incubator.apache.org/"; homepage = "https://mxnet.incubator.apache.org/";
maintainers = with maintainers; [ abbradar ]; maintainers = with maintainers; [ abbradar ];
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

1
pkgs/top-level/all-packages.nix
View file

@ -31870,7 +31870,6 @@ with pkgs;
mxnet = callPackage ../applications/science/math/mxnet { mxnet = callPackage ../applications/science/math/mxnet {
inherit (linuxPackages) nvidia_x11; inherit (linuxPackages) nvidia_x11;
stdenv = gcc9Stdenv;
}; };
wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; }; wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; };