diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2020-04-20 15:27:26 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2020-04-21 22:07:00 +0800 |
commit | 53c87950e8bb913fab021213469ab8ea1d58c2f1 (patch) | |
tree | 8ab4b96e0ea058a84c7e3c80df04c468447913ed /dynamic-layers/clang-layer/recipes-core/dnn/files/0002-src-CMakeLists.txt-use-value-of-DESTDIR.patch | |
parent | 28c9337302f0a4525c6696549c7ea7800d6c63a1 (diff) | |
download | meta-intel-53c87950e8bb913fab021213469ab8ea1d58c2f1.tar.gz |
mkl-dnn: upgrade 1.2.2 -> 1.4
The name of project has changed to oneDNN. Enable GPU engine to be built
by default which would need clang layer to be included.
Also include two minor fixes to install logic that have been submitted
for review upstream.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'dynamic-layers/clang-layer/recipes-core/dnn/files/0002-src-CMakeLists.txt-use-value-of-DESTDIR.patch')
-rw-r--r-- | dynamic-layers/clang-layer/recipes-core/dnn/files/0002-src-CMakeLists.txt-use-value-of-DESTDIR.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/files/0002-src-CMakeLists.txt-use-value-of-DESTDIR.patch b/dynamic-layers/clang-layer/recipes-core/dnn/files/0002-src-CMakeLists.txt-use-value-of-DESTDIR.patch new file mode 100644 index 00000000..02c0f81e --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-core/dnn/files/0002-src-CMakeLists.txt-use-value-of-DESTDIR.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 3693305c9497f940b011e3e8b9d707d4f8075234 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Tue, 21 Apr 2020 09:19:38 +0800 | ||
4 | Subject: [PATCH 2/2] src/CMakeLists.txt: use value of DESTDIR | ||
5 | |||
6 | Make sure that we're using the value of DESTDIR for the paths that are | ||
7 | being created to look into paths of installed files. Ensure that | ||
8 | cmake_install.cmake actually has $ENV{DESTDIR} which gets expanded if | ||
9 | it's being passed to cmake. | ||
10 | |||
11 | Upstream-Status: Submitted | ||
12 | |||
13 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
14 | --- | ||
15 | src/CMakeLists.txt | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | ||
19 | index 0c99fefae..2f1499d0d 100644 | ||
20 | --- a/src/CMakeLists.txt | ||
21 | +++ b/src/CMakeLists.txt | ||
22 | @@ -137,7 +137,7 @@ install(EXPORT ${LIB_EXPORT_NAME} | ||
23 | |||
24 | # Intel MKL-DNN compat cmake files | ||
25 | install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} | ||
26 | - -DDIR=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake | ||
27 | + -DDIR=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake | ||
28 | -P ${PROJECT_SOURCE_DIR}/cmake/gen_mkldnn_compat_cmakes.cmake)") | ||
29 | |||
30 | # Intel MKL-DNN compat libraries | ||
31 | -- | ||
32 | 2.25.3 | ||
33 | |||