diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2020-06-22 11:30:59 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2020-06-22 13:59:04 +0800 |
commit | 013ef7ebea9c1d30f59c4568f09ca89ce8672fbe (patch) | |
tree | a2c6258df55271596c002acba6cd62a12d295286 /dynamic-layers/clang-layer | |
parent | c582f125eb82a7c22cf9fd610fd6ab763dc1e8cc (diff) | |
download | meta-intel-013ef7ebea9c1d30f59c4568f09ca89ce8672fbe.tar.gz |
onednn: upgrade 1.4 -> 1.5
Remove patches that have been merged upstream.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'dynamic-layers/clang-layer')
-rw-r--r-- | dynamic-layers/clang-layer/recipes-core/dnn/files/0001-src-CMakeLists.txt-fix-FindOpenCL.cmake-source-path.patch | 34 | ||||
-rw-r--r-- | dynamic-layers/clang-layer/recipes-core/dnn/files/0002-src-CMakeLists.txt-use-value-of-DESTDIR.patch | 33 | ||||
-rw-r--r-- | dynamic-layers/clang-layer/recipes-core/dnn/onednn_1.5.bb (renamed from dynamic-layers/clang-layer/recipes-core/dnn/onednn_1.4.bb) | 12 |
3 files changed, 5 insertions, 74 deletions
diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/files/0001-src-CMakeLists.txt-fix-FindOpenCL.cmake-source-path.patch b/dynamic-layers/clang-layer/recipes-core/dnn/files/0001-src-CMakeLists.txt-fix-FindOpenCL.cmake-source-path.patch deleted file mode 100644 index aee0934a..00000000 --- a/dynamic-layers/clang-layer/recipes-core/dnn/files/0001-src-CMakeLists.txt-fix-FindOpenCL.cmake-source-path.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From 89ebbee73ff0af48eaaec63335b749a176a317bb Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Tue, 21 Apr 2020 09:18:09 +0800 | ||
4 | Subject: [PATCH 1/2] src/CMakeLists.txt: fix FindOpenCL.cmake source path | ||
5 | |||
6 | The existing logic doesn't work when DESTDIR is being passed to cmake. | ||
7 | The file is installed in DESTDIR/CMAKE_INSTALL_PREFIX/libdir while we're | ||
8 | trying to copy it from CMAKE_INSTALL_PREFIX/libdir. | ||
9 | |||
10 | Use the file from source tree instead. | ||
11 | |||
12 | Upstream-Status: Submitted | ||
13 | |||
14 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
15 | --- | ||
16 | src/CMakeLists.txt | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | ||
20 | index 88e318923..0c99fefae 100644 | ||
21 | --- a/src/CMakeLists.txt | ||
22 | +++ b/src/CMakeLists.txt | ||
23 | @@ -203,7 +203,7 @@ if(DNNL_GPU_RUNTIME STREQUAL "OCL") | ||
24 | install(FILES | ||
25 | "../cmake/FindOpenCL.cmake" | ||
26 | DESTINATION ${LIB_CONFIG_INSTALL_DIR}) | ||
27 | - install(FILES "${CMAKE_INSTALL_PREFIX}/${LIB_CONFIG_INSTALL_DIR}/FindOpenCL.cmake" | ||
28 | + install(FILES "../cmake/FindOpenCL.cmake" | ||
29 | DESTINATION ${LIB_CONFIG_INSTALL_DIR_COMPAT}) | ||
30 | endif() | ||
31 | |||
32 | -- | ||
33 | 2.25.3 | ||
34 | |||
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 deleted file mode 100644 index 02c0f81e..00000000 --- a/dynamic-layers/clang-layer/recipes-core/dnn/files/0002-src-CMakeLists.txt-use-value-of-DESTDIR.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
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 | |||
diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_1.4.bb b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_1.5.bb index 7889099a..36c1a9d8 100644 --- a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_1.4.bb +++ b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_1.5.bb | |||
@@ -5,20 +5,18 @@ deep-learning applications and frameworks on Intel architecture." | |||
5 | LICENSE = "Apache-2.0 & BSD-3-Clause & BSL-1.0" | 5 | LICENSE = "Apache-2.0 & BSD-3-Clause & BSL-1.0" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3c6ff4426dbd618bcfd552ac4a7c1c56 \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3c6ff4426dbd618bcfd552ac4a7c1c56 \ |
7 | file://tests/gtests/gtest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \ | 7 | file://tests/gtests/gtest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \ |
8 | file://src/cpu/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \ | 8 | file://src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \ |
9 | file://src/cpu/jit_utils/jitprofiling/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \ | 9 | file://src/cpu/x64/jit_utils/jitprofiling/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \ |
10 | file://doc/assets/mathjax/MathJax.js;endline=17;md5=25a014ad78c3d72a0e15d15f1d007c20 \ | 10 | file://doc/assets/mathjax/MathJax.js;endline=17;md5=25a014ad78c3d72a0e15d15f1d007c20 \ |
11 | file://src/common/primitive_hashing.hpp;beginline=52;endline=55;md5=f56de33cb6ec02de60006b10e027b300 \ | 11 | file://src/common/primitive_hashing.hpp;beginline=237;endline=240;md5=f56de33cb6ec02de60006b10e027b300 \ |
12 | " | 12 | " |
13 | SECTION = "lib" | 13 | SECTION = "lib" |
14 | 14 | ||
15 | inherit pkgconfig cmake ptest | 15 | inherit pkgconfig cmake ptest |
16 | 16 | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | SRCREV = "f7c41dc7b5471ad8bf7905e459bbed27f9094caa" | 18 | SRCREV = "e2ac1fac44c5078ca927cb9b90e1b3066a0b2ed0" |
19 | SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=rls-v1.4 \ | 19 | SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=rls-v1.5 \ |
20 | file://0001-src-CMakeLists.txt-fix-FindOpenCL.cmake-source-path.patch \ | ||
21 | file://0002-src-CMakeLists.txt-use-value-of-DESTDIR.patch \ | ||
22 | file://run-ptest \ | 20 | file://run-ptest \ |
23 | " | 21 | " |
24 | 22 | ||