From 013ef7ebea9c1d30f59c4568f09ca89ce8672fbe Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Mon, 22 Jun 2020 11:30:59 +0800 Subject: onednn: upgrade 1.4 -> 1.5 Remove patches that have been merged upstream. Signed-off-by: Anuj Mittal --- ...ists.txt-fix-FindOpenCL.cmake-source-path.patch | 34 ------------- ...2-src-CMakeLists.txt-use-value-of-DESTDIR.patch | 33 ------------ .../clang-layer/recipes-core/dnn/onednn_1.4.bb | 58 ---------------------- .../clang-layer/recipes-core/dnn/onednn_1.5.bb | 56 +++++++++++++++++++++ 4 files changed, 56 insertions(+), 125 deletions(-) delete mode 100644 dynamic-layers/clang-layer/recipes-core/dnn/files/0001-src-CMakeLists.txt-fix-FindOpenCL.cmake-source-path.patch delete mode 100644 dynamic-layers/clang-layer/recipes-core/dnn/files/0002-src-CMakeLists.txt-use-value-of-DESTDIR.patch delete mode 100644 dynamic-layers/clang-layer/recipes-core/dnn/onednn_1.4.bb create mode 100644 dynamic-layers/clang-layer/recipes-core/dnn/onednn_1.5.bb 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 @@ -From 89ebbee73ff0af48eaaec63335b749a176a317bb Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Tue, 21 Apr 2020 09:18:09 +0800 -Subject: [PATCH 1/2] src/CMakeLists.txt: fix FindOpenCL.cmake source path - -The existing logic doesn't work when DESTDIR is being passed to cmake. -The file is installed in DESTDIR/CMAKE_INSTALL_PREFIX/libdir while we're -trying to copy it from CMAKE_INSTALL_PREFIX/libdir. - -Use the file from source tree instead. - -Upstream-Status: Submitted - -Signed-off-by: Anuj Mittal ---- - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 88e318923..0c99fefae 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -203,7 +203,7 @@ if(DNNL_GPU_RUNTIME STREQUAL "OCL") - install(FILES - "../cmake/FindOpenCL.cmake" - DESTINATION ${LIB_CONFIG_INSTALL_DIR}) -- install(FILES "${CMAKE_INSTALL_PREFIX}/${LIB_CONFIG_INSTALL_DIR}/FindOpenCL.cmake" -+ install(FILES "../cmake/FindOpenCL.cmake" - DESTINATION ${LIB_CONFIG_INSTALL_DIR_COMPAT}) - endif() - --- -2.25.3 - 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 @@ -From 3693305c9497f940b011e3e8b9d707d4f8075234 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Tue, 21 Apr 2020 09:19:38 +0800 -Subject: [PATCH 2/2] src/CMakeLists.txt: use value of DESTDIR - -Make sure that we're using the value of DESTDIR for the paths that are -being created to look into paths of installed files. Ensure that -cmake_install.cmake actually has $ENV{DESTDIR} which gets expanded if -it's being passed to cmake. - -Upstream-Status: Submitted - -Signed-off-by: Anuj Mittal ---- - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 0c99fefae..2f1499d0d 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -137,7 +137,7 @@ install(EXPORT ${LIB_EXPORT_NAME} - - # Intel MKL-DNN compat cmake files - install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -- -DDIR=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake -+ -DDIR=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake - -P ${PROJECT_SOURCE_DIR}/cmake/gen_mkldnn_compat_cmakes.cmake)") - - # Intel MKL-DNN compat libraries --- -2.25.3 - diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_1.4.bb b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_1.4.bb deleted file mode 100644 index 7889099a..00000000 --- a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_1.4.bb +++ /dev/null @@ -1,58 +0,0 @@ -HOMEPAGE = "https://www.oneapi.com" -SUMMARY = "Deep Neural Network Library" -DESCRIPTION = "This software is a user mode library that accelerates\ -deep-learning applications and frameworks on Intel architecture." -LICENSE = "Apache-2.0 & BSD-3-Clause & BSL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3c6ff4426dbd618bcfd552ac4a7c1c56 \ - file://tests/gtests/gtest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \ - file://src/cpu/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \ - file://src/cpu/jit_utils/jitprofiling/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \ - file://doc/assets/mathjax/MathJax.js;endline=17;md5=25a014ad78c3d72a0e15d15f1d007c20 \ - file://src/common/primitive_hashing.hpp;beginline=52;endline=55;md5=f56de33cb6ec02de60006b10e027b300 \ - " -SECTION = "lib" - -inherit pkgconfig cmake ptest - -S = "${WORKDIR}/git" -SRCREV = "f7c41dc7b5471ad8bf7905e459bbed27f9094caa" -SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=rls-v1.4 \ - file://0001-src-CMakeLists.txt-fix-FindOpenCL.cmake-source-path.patch \ - file://0002-src-CMakeLists.txt-use-value-of-DESTDIR.patch \ - file://run-ptest \ - " - -UPSTREAM_CHECK_GITTAGREGEX = "^v(?P(\d+(\.\d+)+))$" - -CVE_PRODUCT = "intel:math_kernel_library" - -COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST_libc-musl = 'null' - -EXTRA_OECMAKE += " \ - -DDNNL_LIBRARY_TYPE=SHARED \ - -DDNNL_BUILD_EXAMPLES=ON \ - -DDNNL_BUILD_TESTS=ON \ - -DDNNL_CPU_RUNTIME=OMP \ - -DDNNL_ARCH_OPT_FLAGS="" \ - -DCMAKE_SKIP_RPATH=ON \ - " - -PACKAGECONFIG ??= "" -PACKAGECONFIG[gpu] = "-DDNNL_GPU_RUNTIME=OCL, , opencl-headers ocl-icd, intel-compute-runtime" - -do_install_append () { - install -d ${D}${bindir}/mkl-dnn/tests/benchdnn/inputs - install -m 0755 ${B}/tests/benchdnn/benchdnn ${D}${bindir}/mkl-dnn/tests/benchdnn - cp -r ${B}/tests/benchdnn/inputs/* ${D}${bindir}/mkl-dnn/tests/benchdnn/inputs -} - -do_install_ptest () { - install -d ${D}${PTEST_PATH}/tests - install -m 0755 ${B}/tests/api-c ${D}${PTEST_PATH}/tests - install -m 0755 ${B}/tests/test_c_symbols-c ${D}${PTEST_PATH}/tests -} - -PACKAGES =+ "${PN}-test" - -FILES_${PN}-test = "${bindir}/mkl-dnn/*" diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_1.5.bb b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_1.5.bb new file mode 100644 index 00000000..36c1a9d8 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_1.5.bb @@ -0,0 +1,56 @@ +HOMEPAGE = "https://www.oneapi.com" +SUMMARY = "Deep Neural Network Library" +DESCRIPTION = "This software is a user mode library that accelerates\ +deep-learning applications and frameworks on Intel architecture." +LICENSE = "Apache-2.0 & BSD-3-Clause & BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3c6ff4426dbd618bcfd552ac4a7c1c56 \ + file://tests/gtests/gtest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \ + file://src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \ + file://src/cpu/x64/jit_utils/jitprofiling/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \ + file://doc/assets/mathjax/MathJax.js;endline=17;md5=25a014ad78c3d72a0e15d15f1d007c20 \ + file://src/common/primitive_hashing.hpp;beginline=237;endline=240;md5=f56de33cb6ec02de60006b10e027b300 \ + " +SECTION = "lib" + +inherit pkgconfig cmake ptest + +S = "${WORKDIR}/git" +SRCREV = "e2ac1fac44c5078ca927cb9b90e1b3066a0b2ed0" +SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=rls-v1.5 \ + file://run-ptest \ + " + +UPSTREAM_CHECK_GITTAGREGEX = "^v(?P(\d+(\.\d+)+))$" + +CVE_PRODUCT = "intel:math_kernel_library" + +COMPATIBLE_HOST = '(x86_64).*-linux' +COMPATIBLE_HOST_libc-musl = 'null' + +EXTRA_OECMAKE += " \ + -DDNNL_LIBRARY_TYPE=SHARED \ + -DDNNL_BUILD_EXAMPLES=ON \ + -DDNNL_BUILD_TESTS=ON \ + -DDNNL_CPU_RUNTIME=OMP \ + -DDNNL_ARCH_OPT_FLAGS="" \ + -DCMAKE_SKIP_RPATH=ON \ + " + +PACKAGECONFIG ??= "" +PACKAGECONFIG[gpu] = "-DDNNL_GPU_RUNTIME=OCL, , opencl-headers ocl-icd, intel-compute-runtime" + +do_install_append () { + install -d ${D}${bindir}/mkl-dnn/tests/benchdnn/inputs + install -m 0755 ${B}/tests/benchdnn/benchdnn ${D}${bindir}/mkl-dnn/tests/benchdnn + cp -r ${B}/tests/benchdnn/inputs/* ${D}${bindir}/mkl-dnn/tests/benchdnn/inputs +} + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/tests/api-c ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/tests/test_c_symbols-c ${D}${PTEST_PATH}/tests +} + +PACKAGES =+ "${PN}-test" + +FILES_${PN}-test = "${bindir}/mkl-dnn/*" -- cgit v1.2.3-54-g00ecf