From 8f1c94942eb090a41e3a62defc6b520a2cbf9889 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 20 Jul 2020 04:20:00 -0500
Subject: [PATCH 1/3] oneDNN: enable on darwin
---
pkgs/development/libraries/oneDNN/default.nix | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix
index 01ce51be18d0..497e5afb5ffd 100644
--- a/pkgs/development/libraries/oneDNN/default.nix
+++ b/pkgs/development/libraries/oneDNN/default.nix
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
# The test driver doesn't add an RPath to the build libdir
preCheck = ''
- export LD_LIBRARY_PATH=$PWD/src
+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/src
+ export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/src
'';
# The cmake install gets tripped up and installs a nix tree into $out, in
@@ -36,7 +37,7 @@ stdenv.mkDerivation rec {
homepage = "https://01.org/dnnl";
changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}";
license = licenses.asl20;
- platforms = [ "aarch64-linux" "x86_64-linux" ];
+ platforms = platforms.all;
maintainers = with maintainers; [ alexarice bhipple ];
};
}
From f02babb59e3e4f17831fa6296d94457b70ba0763 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 20 Jul 2020 04:20:00 -0500
Subject: [PATCH 2/3] oneDNN: update homepage
---
pkgs/development/libraries/oneDNN/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix
index 497e5afb5ffd..d18f8c623427 100644
--- a/pkgs/development/libraries/oneDNN/default.nix
+++ b/pkgs/development/libraries/oneDNN/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "oneAPI Deep Neural Network Library (oneDNN)";
- homepage = "https://01.org/dnnl";
+ homepage = "https://01.org/oneDNN";
changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}";
license = licenses.asl20;
platforms = platforms.all;
From a19f4434e8e767ea8c87dcf50719e241d7ed42c9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 21 Jul 2020 04:20:00 -0500
Subject: [PATCH 3/3] oneDNN: 1.5 -> 1.5.1
---
pkgs/development/libraries/oneDNN/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix
index d18f8c623427..af00b757b139 100644
--- a/pkgs/development/libraries/oneDNN/default.nix
+++ b/pkgs/development/libraries/oneDNN/default.nix
@@ -5,13 +5,13 @@
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
stdenv.mkDerivation rec {
pname = "oneDNN";
- version = "1.5";
+ version = "1.5.1";
src = fetchFromGitHub {
owner = "oneapi-src";
repo = "oneDNN";
rev = "v${version}";
- sha256 = "0diiy3g4wz5lnz5mdvka5p2nwmrpfldsz83sssr5yiir29m4lqap";
+ sha256 = "1l66gkidldjpznp8pb01wdgrmm0rmrbndv8lzidz8fp9hf473zgl";
};
outputs = [ "out" "dev" "doc" ];