From 4162501e85481827f2ef65afe86a29cdd89cb57e Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
Date: Mon, 20 Apr 2020 15:27:26 +0800
Subject: mkl-dnn: upgrade 1.2.2 -> 1.4

The name of project has changed to oneDNN. Enable GPU engine to be built
by default which would need clang layer to be included.

Also include two minor fixes to install logic that have been submitted
for review upstream.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 recipes-core/mkl-dnn/files/run-ptest  | 15 ----------
 recipes-core/mkl-dnn/mkl-dnn_1.2.2.bb | 53 -----------------------------------
 2 files changed, 68 deletions(-)
 delete mode 100755 recipes-core/mkl-dnn/files/run-ptest
 delete mode 100644 recipes-core/mkl-dnn/mkl-dnn_1.2.2.bb

(limited to 'recipes-core')

diff --git a/recipes-core/mkl-dnn/files/run-ptest b/recipes-core/mkl-dnn/files/run-ptest
deleted file mode 100755
index 82d4df58..00000000
--- a/recipes-core/mkl-dnn/files/run-ptest
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-cd tests
-./api-c
-if [ $? -eq 0 ]; then
-  echo 'PASS: api-c'
-else
-  echo 'FAIL: api-c'
-fi
-./test_c_symbols-c
-if [ $? -eq 0 ]; then
-  echo 'PASS: test_c_symbols-c'
-else
-  echo 'FAIL: test_c_symbols-c'
-fi
diff --git a/recipes-core/mkl-dnn/mkl-dnn_1.2.2.bb b/recipes-core/mkl-dnn/mkl-dnn_1.2.2.bb
deleted file mode 100644
index 1231fdf0..00000000
--- a/recipes-core/mkl-dnn/mkl-dnn_1.2.2.bb
+++ /dev/null
@@ -1,53 +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=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 = "8e96ef49488c65e0738c552cec5c0563ab92c1af"
-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