Merge pull request #85499 from bhipple/u/dnnl
This commit is contained in:
commit
6cfb2c8ebc
|
@ -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")
|
|
|
@ -1,23 +1,20 @@
|
||||||
{ stdenv, lib, fetchFromGitHub, substituteAll, cmake, bash }:
|
{ 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 {
|
stdenv.mkDerivation rec {
|
||||||
pname = "dnnl";
|
pname = "dnnl";
|
||||||
version = "1.2.2";
|
version = "1.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "intel";
|
owner = "oneapi-src";
|
||||||
repo = "mkl-dnn";
|
repo = "oneDNN";
|
||||||
rev = "v${version}";
|
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" ];
|
outputs = [ "out" "dev" "doc" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
@ -36,8 +33,9 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Deep Neural Network Library (DNNL)";
|
description = "oneAPI Deep Neural Network Library (oneDNN)";
|
||||||
homepage = "https://intel.github.io/mkl-dnn/dev_guide_transition_to_dnnl.html";
|
homepage = "https://01.org/dnnl";
|
||||||
|
changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
platforms = [ "x86_64-linux" ];
|
platforms = [ "x86_64-linux" ];
|
||||||
maintainers = with maintainers; [ alexarice bhipple ];
|
maintainers = with maintainers; [ alexarice bhipple ];
|
||||||
|
|
Loading…
Reference in a new issue