From 5ac4f45f728fc44ddc95f7beabbdc0b9102e508f Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Thu, 22 Sep 2022 16:50:21 -0700 Subject: [PATCH] mxnet: patch to fix build on aarch64-darwin The patches autodetect when the system is x86 and supports SSE. --- .../applications/science/math/mxnet/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 599d97639742..9a1b550d882d 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, lib, fetchurl, bash, cmake +{ config, stdenv, lib, fetchurl, fetchpatch, bash, cmake , opencv3, gtest, blas, gomp, llvmPackages, perl , cudaSupport ? config.cudaSupport or false, cudaPackages ? {}, nvidia_x11 , cudnnSupport ? cudaSupport @@ -21,6 +21,21 @@ stdenv.mkDerivation rec { hash = "sha256-EephMoF02MKblvNBl34D3rC/Sww3rOZY+T442euMkyI="; }; + patches = [ + # Remove the following two patches when updating mxnet to 2.0. + (fetchpatch { + name = "1-auto-disable-sse-for-non-x86.patch"; + url = "https://github.com/apache/incubator-mxnet/commit/55e69871d4cadec51a8bbb6700131065388cb0b9.patch"; + hash = "sha256-uaMpM0F9HRtEBXz2ewB/dlbuKaY5/RineCPUE2T6CHU="; + }) + (fetchpatch { + name = "2-auto-disable-sse-for-non-x86.patch"; + url = "https://github.com/apache/incubator-mxnet/commit/c1b96f562f55dfa024ac941d7b104f00e239ee0f.patch"; + excludes = ["ci/docker/runtime_functions.sh"]; + hash = "sha256-r1LbC8ueRooW5tTNakAlRSJ+9aR4WXXoEKx895DgOs4="; + }) + ]; + nativeBuildInputs = [ cmake perl ]; buildInputs = [ opencv3 gtest blas.provider ]