From f4522647f2b93bb9c4d3a578b07f0f7cc89c9507 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Tue, 24 Aug 2021 23:30:04 +0800 Subject: onednn: upgrade 2.2.3 -> 2.3.2 Release notes: https://github.com/oneapi-src/oneDNN/releases License-Update: Copyright years updated Signed-off-by: Anuj Mittal --- .../dnn/files/fix-gcc-11-failures.patch | 38 --------------- .../clang-layer/recipes-core/dnn/onednn_2.2.3.bb | 56 ---------------------- .../clang-layer/recipes-core/dnn/onednn_2.3.2.bb | 55 +++++++++++++++++++++ 3 files changed, 55 insertions(+), 94 deletions(-) delete mode 100644 dynamic-layers/clang-layer/recipes-core/dnn/files/fix-gcc-11-failures.patch delete mode 100644 dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.2.3.bb create mode 100644 dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.3.2.bb (limited to 'dynamic-layers/clang-layer/recipes-core/dnn') diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/files/fix-gcc-11-failures.patch b/dynamic-layers/clang-layer/recipes-core/dnn/files/fix-gcc-11-failures.patch deleted file mode 100644 index 758cc45d..00000000 --- a/dynamic-layers/clang-layer/recipes-core/dnn/files/fix-gcc-11-failures.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f04b34854b42a0f5bd754398fdefd4573bb38b66 Mon Sep 17 00:00:00 2001 -From: Denis Samoilov -Date: Fri, 2 Apr 2021 19:46:22 -0700 -Subject: [PATCH] common, gpu: include thread and limit headers to fix GCC 11 - build issues - -Upstream-Status: Backport [https://github.com/oneapi-src/oneDNN/commit/1fe0f2594a1bfc6386fd8f6537f971d5ae9c1214] -Signed-off-by: Anuj Mittal - ---- - src/common/primitive_cache.hpp | 1 + - src/gpu/jit/ngen/ngen_auto_swsb.hpp | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/common/primitive_cache.hpp b/src/common/primitive_cache.hpp -index 73cb1224f..05a3e53e5 100644 ---- a/src/common/primitive_cache.hpp -+++ b/src/common/primitive_cache.hpp -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - - #include "c_types_map.hpp" -diff --git a/src/gpu/jit/ngen/ngen_auto_swsb.hpp b/src/gpu/jit/ngen/ngen_auto_swsb.hpp -index de3417af3..62ef2a571 100644 ---- a/src/gpu/jit/ngen/ngen_auto_swsb.hpp -+++ b/src/gpu/jit/ngen/ngen_auto_swsb.hpp -@@ -33,6 +33,7 @@ - - #include - #include -+#include - - namespace ngen { - namespace autoswsb { diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.2.3.bb b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.2.3.bb deleted file mode 100644 index c24c6440..00000000 --- a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.2.3.bb +++ /dev/null @@ -1,56 +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=8e17c0f9656ebaf0c380d9b22707c846 \ - file://tests/gtests/gtest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \ - file://src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \ - file://src/common/ittnotify/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \ - file://doc/assets/mathjax/MathJax.js;endline=17;md5=25a014ad78c3d72a0e15d15f1d007c20 \ - " -SECTION = "lib" - -inherit pkgconfig cmake ptest - -S = "${WORKDIR}/git" -SRCREV = "7336ca9f055cf1bfa13efb658fe15dc9b41f0740" -SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=rls-v2.2 \ - file://fix-gcc-11-failures.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_2.3.2.bb b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.3.2.bb new file mode 100644 index 00000000..40ef6ebf --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.3.2.bb @@ -0,0 +1,55 @@ +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=b48e3de3bfd47c27882a0d85b20823f5 \ + file://tests/gtests/gtest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \ + file://src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \ + file://src/common/ittnotify/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \ + file://doc/assets/mathjax/MathJax.js;endline=17;md5=25a014ad78c3d72a0e15d15f1d007c20 \ + " +SECTION = "lib" + +inherit pkgconfig cmake ptest + +S = "${WORKDIR}/git" +SRCREV = "e2d45252ae9c3e91671339579e3c0f0061f81d49" +SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=rls-v2.3 \ + 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