From ae4221d52db001f1538f34a689205aa719bbc7d9 Mon Sep 17 00:00:00 2001
From: Naveen Saini <naveen.kumar.saini@intel.com>
Date: Fri, 7 Feb 2020 13:59:47 +0800
Subject: mkl-dnn: upgrade v1.1.1 -> v1.2

Added full text of third party licenses and copyright
notices to LICENSE
https://github.com/intel/mkl-dnn/commit/88d4573ed5a13f69be27d7b97b43bddb8057c196

Release notes can be found here:
https://github.com/intel/mkl-dnn/releases/tag/v1.2

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 recipes-core/mkl-dnn/mkl-dnn_1.1.1.bb | 55 -----------------------------------
 recipes-core/mkl-dnn/mkl-dnn_1.2.bb   | 53 +++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 55 deletions(-)
 delete mode 100644 recipes-core/mkl-dnn/mkl-dnn_1.1.1.bb
 create mode 100644 recipes-core/mkl-dnn/mkl-dnn_1.2.bb

(limited to 'recipes-core')

diff --git a/recipes-core/mkl-dnn/mkl-dnn_1.1.1.bb b/recipes-core/mkl-dnn/mkl-dnn_1.1.1.bb
deleted file mode 100644
index 0e18483e..00000000
--- a/recipes-core/mkl-dnn/mkl-dnn_1.1.1.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-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=477df9cc728dd9c63128c0f3525f4649 \
-                    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://cmake/Copyright.txt;md5=622747147b46f22e1953876a7cba3323 \
-                    file://doc/assets/mathjax/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
-                    file://src/common/LICENSE_1_0;md5=e4224ccaecb14d942c71d31bef20d78c \
-                    "
-SECTION = "lib"
-
-inherit pkgconfig cmake ptest
-
-S = "${WORKDIR}/git"
-SRCREV = "52c3052df8ec1d5b8b45cb6c350a952840eabd42"
-SRC_URI = "git://github.com/intel/mkl-dnn.git;branch=rls-v1.1 \
-           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"
-EXTRA_OECMAKE += "-DDNNL_THREADING=OMP"
-EXTRA_OECMAKE += "-DWITH_EXAMPLE=ON"
-EXTRA_OECMAKE += "-DWITH_TEST=ON"
-EXTRA_OECMAKE += "-DARCH_OPT_FLAGS=''"
-EXTRA_OECMAKE += "-DCMAKE_SKIP_RPATH=ON"
-
-do_install_append () {
-    install -d ${D}${bindir}/mkl-dnn
-    install -d ${D}${bindir}/mkl-dnn/tests
-    install -d ${D}${bindir}/mkl-dnn/tests/benchdnn
-    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/recipes-core/mkl-dnn/mkl-dnn_1.2.bb b/recipes-core/mkl-dnn/mkl-dnn_1.2.bb
new file mode 100644
index 00000000..fc80b19b
--- /dev/null
+++ b/recipes-core/mkl-dnn/mkl-dnn_1.2.bb
@@ -0,0 +1,53 @@
+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=0c328b62744f16fbb96f4335c5b65325 \
+                    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/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+                    "
+SECTION = "lib"
+
+inherit pkgconfig cmake ptest
+
+S = "${WORKDIR}/git"
+SRCREV = "75d0b1a7f3586c212e37acebbb8acd221cee7216"
+SRC_URI = "git://github.com/intel/mkl-dnn.git;branch=rls-v1.2 \
+           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"
+EXTRA_OECMAKE += "-DDNNL_THREADING=OMP"
+EXTRA_OECMAKE += "-DWITH_EXAMPLE=ON"
+EXTRA_OECMAKE += "-DWITH_TEST=ON"
+EXTRA_OECMAKE += "-DARCH_OPT_FLAGS=''"
+EXTRA_OECMAKE += "-DCMAKE_SKIP_RPATH=ON"
+
+do_install_append () {
+    install -d ${D}${bindir}/mkl-dnn
+    install -d ${D}${bindir}/mkl-dnn/tests
+    install -d ${D}${bindir}/mkl-dnn/tests/benchdnn
+    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