From 48ddf2b0e6fa5450e63878e1fc31dfc91cf3fd94 Mon Sep 17 00:00:00 2001
From: Teoh Suh Haw <suh.haw.teoh@intel.com>
Date: Wed, 12 Apr 2023 13:57:00 +0800
Subject: onednn: upgrade 3.0.1 -> 3.1

Release Notes:
https://github.com/oneapi-src/oneDNN/releases/tag/v3.1

Disable Graph API with ONEDNN_BUILD_GRAPH=OFF because that is not supported with DNNL_GPU_RUNTIME=OCL.

Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 .../clang-layer/recipes-core/dnn/onednn_3.0.1.bb   | 54 ---------------------
 .../clang-layer/recipes-core/dnn/onednn_3.1.bb     | 55 ++++++++++++++++++++++
 2 files changed, 55 insertions(+), 54 deletions(-)
 delete mode 100644 dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.0.1.bb
 create mode 100644 dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.1.bb

diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.0.1.bb b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.0.1.bb
deleted file mode 100644
index 79a979be..00000000
--- a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.0.1.bb
+++ /dev/null
@@ -1,54 +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=b48e3de3bfd47c27882a0d85b20823f5 \
-                    file://tests/gtests/gtest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \
-                    file://src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \
-                    file://src/common/ittnotify/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \
-                    "
-SECTION = "lib"
-
-inherit pkgconfig cmake ptest
-
-S = "${WORKDIR}/git"
-SRCREV = "51f9bd790743e313bdecc767d8e6c5cc729e07ab"
-SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=rls-v3.0;protocol=https \
-           file://run-ptest \
-           "
-
-UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>(\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 ??= "gpu"
-PACKAGECONFIG[gpu] = "-DDNNL_GPU_RUNTIME=OCL, , opencl-headers virtual/opencl-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_3.1.bb b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.1.bb
new file mode 100644
index 00000000..7ef7fe64
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.1.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 \
+                    "
+SECTION = "lib"
+
+inherit pkgconfig cmake ptest
+
+S = "${WORKDIR}/git"
+SRCREV = "928065bd62372d2824900a86c5438bba407c98d1"
+SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=rls-v3.1;protocol=https \
+           file://run-ptest \
+           "
+
+UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>(\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 \
+                   -DONEDNN_BUILD_GRAPH=OFF \
+                   "
+
+PACKAGECONFIG ??= "gpu"
+PACKAGECONFIG[gpu] = "-DDNNL_GPU_RUNTIME=OCL, , opencl-headers virtual/opencl-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