dnnl: init at 1.1.2

This commit continues the work proposed in #68014, and provides an entirely FOSS
variant of the `dnnl` package. Updates to add an `mkl` flavor will be added
later, pending discussion about the cleanest way to overlay this consistently.

Fixes #67982, closes #68014

Co-authored-by: Alex Rice <alexrice999@hotmail.co.uk>
This commit is contained in:
Benjamin Hipple 2019-12-02 23:49:50 -05:00 committed by Jon
parent 52487f4e43
commit d4119389bd
3 changed files with 54 additions and 0 deletions

View File

@ -0,0 +1,13 @@
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")

View File

@ -0,0 +1,39 @@
{ stdenv, lib, fetchFromGitHub, substituteAll, cmake, bash }:
stdenv.mkDerivation rec {
pname = "dnnl";
version = "1.1.2";
src = fetchFromGitHub {
owner = "intel";
repo = "mkl-dnn";
rev = "v${version}";
sha256 = "150cdyfiw4izvzmbmdqidwadppb1qjmzhpaqjczm397ygi1m92l1";
};
# Generic fix upstreamed in https://github.com/intel/mkl-dnn/pull/631
# Delete patch when 1.2.0 is released
patches = [ (substituteAll {
src = ./bash-to-sh.patch;
inherit bash;
}) ];
outputs = [ "out" "dev" "doc" ];
nativeBuildInputs = [ cmake ];
# The test driver doesn't add an RPath to the build libdir
preCheck = ''
export LD_LIBRARY_PATH=$PWD/src
'';
doCheck = true;
meta = with lib; {
description = "Deep Neural Network Library (DNNL)";
homepage = "https://intel.github.io/mkl-dnn/dev_guide_transition_to_dnnl.html";
license = licenses.asl20;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ alexarice bhipple ];
};
}

View File

@ -11220,6 +11220,8 @@ in
dhex = callPackage ../applications/editors/dhex { };
dnnl = callPackage ../development/libraries/dnnl { };
double-conversion = callPackage ../development/libraries/double-conversion { };
dclib = callPackage ../development/libraries/dclib { };