From fae140eb192b3568edf49241466b4f1f1c21c57f Mon Sep 17 00:00:00 2001
From: Naveen Saini <naveen.kumar.saini@intel.com>
Date: Mon, 5 Aug 2019 11:38:59 +0800
Subject: mkl-dnn: upgrade v0.19 -> v1.0.1

Added third party license info:
"ittnotify, 3-clause BSD license
Copyright (c) 2011, Intel Corporation
See full copyright notice and license text in
src/cpu/jit_utils/jitprofiling/LICENSE.BSD"

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

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.0.1.bb | 49 +++++++++++++++++++++++++++++++++++
 recipes-core/mkl-dnn/mkl-dnn_git.bb   | 49 -----------------------------------
 2 files changed, 49 insertions(+), 49 deletions(-)
 create mode 100644 recipes-core/mkl-dnn/mkl-dnn_1.0.1.bb
 delete mode 100644 recipes-core/mkl-dnn/mkl-dnn_git.bb

diff --git a/recipes-core/mkl-dnn/mkl-dnn_1.0.1.bb b/recipes-core/mkl-dnn/mkl-dnn_1.0.1.bb
new file mode 100644
index 00000000..16654505
--- /dev/null
+++ b/recipes-core/mkl-dnn/mkl-dnn_1.0.1.bb
@@ -0,0 +1,49 @@
+SUMMARY  = "Intel Math Kernel Library for Deep Neural Networks"
+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"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a34303951205b8c53485477c74052380 \
+	file://tests/gtests/gtest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \
+	file://src/cpu/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \
+	file://src/cpu/jit_utils/jitprofiling/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb"
+SECTION = "lib"
+
+inherit pkgconfig cmake ptest
+
+S = "${WORKDIR}/git"
+SRCREV = "61b9663bcd58ece1b96b930bed73d6545f41d656"
+SRC_URI = "git://github.com/intel/mkl-dnn.git;branch=rls-v1.0 \
+        file://run-ptest \
+"
+
+UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>(\d+(\.\d+)+))$"
+
+COMPATIBLE_HOST = '(x86_64).*-linux'
+COMPATIBLE_HOST_libc-musl = 'null'
+
+EXTRA_OECMAKE += "-DMKLDNN_LIBRARY_TYPE=SHARED"
+EXTRA_OECMAKE += "-DMKLDNN_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_git.bb b/recipes-core/mkl-dnn/mkl-dnn_git.bb
deleted file mode 100644
index 5846b310..00000000
--- a/recipes-core/mkl-dnn/mkl-dnn_git.bb
+++ /dev/null
@@ -1,49 +0,0 @@
-SUMMARY  = "Intel Math Kernel Library for Deep Neural Networks"
-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"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=afa44a3d001cc203032135324f9636b7 \
-	file://tests/gtests/gtest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \
-	file://src/cpu/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa"
-SECTION = "lib"
-
-inherit pkgconfig cmake ptest
-
-S = "${WORKDIR}/git"
-SRCREV = "027de7603662a569366e15132ac80298902b96b8"
-SRC_URI = "git://github.com/intel/mkl-dnn.git;branch=rls-v0.19 \
-        file://run-ptest \
-"
-PV = "0.19+git${SRCPV}"
-
-UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>(\d+(\.\d+)+))$"
-
-COMPATIBLE_HOST = '(x86_64).*-linux'
-COMPATIBLE_HOST_libc-musl = 'null'
-
-EXTRA_OECMAKE += "-DMKLDNN_LIBRARY_TYPE=SHARED"
-EXTRA_OECMAKE += "-DMKLDNN_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