nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 10:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

dnnl: 1.2.2 -> 1.4

Browse Source 
The upstream readme has a note about renaming the git repo and libname:
https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn

Changelog: https://github.com/oneapi-src/oneDNN/releases/tag/v1.4
This commit is contained in:
Benjamin Hipple 2020-04-18 11:38:48 -04:00
parent 1b0d8015fe
commit dfe70a2d63
2 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/dnnl/bash-to-sh.patch
View File

@ -1,13 +0,0 @@
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f6810246..e1d2a1f1 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -72,7 +72,7 @@ if(UNIX OR MINGW)
set(test_c_symbols "${CMAKE_CURRENT_BINARY_DIR}/test_c_symbols.c")
add_custom_command(
OUTPUT ${test_c_symbols}
- COMMAND /bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/generate_c_symbols_refs.sh
+ COMMAND @bash@/bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/generate_c_symbols_refs.sh
${CMAKE_CURRENT_SOURCE_DIR}/.. ${test_c_symbols} ${include_dirs}
)
register_exe(test_c_symbols-c ${test_c_symbols} "test")

24
pkgs/development/libraries/dnnl/default.nix
View File

@ -1,23 +1,20 @@
{ stdenv, lib, fetchFromGitHub, substituteAll, cmake, bash }:
# This was originally called mkl-dnn, then it was renamed to dnnl, and it has
# just recently been renamed again to oneDNN. In a follow-up, let's move the
# attr and alias dnnl -> oneDNN. See here for details:
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
stdenv.mkDerivation rec {
pname = "dnnl";
version = "1.2.2";
version = "1.4";
src = fetchFromGitHub {
owner = "intel";
repo = "mkl-dnn";
owner = "oneapi-src";
repo = "oneDNN";
rev = "v${version}";
sha256 = "0ydy7ibm6sh1awrikyj938n26cpg5magnxraz2d0pj76irv4vj5m";
sha256 = "162fb0c7klahz2irchhyxympi4fq4yp284apc53cadbss41mzld9";
};
# Generic fix merged upstream in https://github.com/intel/mkl-dnn/pull/631
# Delete after next release
patches = [ (substituteAll {
src = ./bash-to-sh.patch;
inherit bash;
}) ];
outputs = [ "out" "dev" "doc" ];
nativeBuildInputs = [ cmake ];
@ -36,8 +33,9 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
description = "Deep Neural Network Library (DNNL)";
homepage = "https://intel.github.io/mkl-dnn/dev_guide_transition_to_dnnl.html";
description = "oneAPI Deep Neural Network Library (oneDNN)";
homepage = "https://01.org/dnnl";
changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}";
license = licenses.asl20;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ alexarice bhipple ];