From dd9437e9bebd028fcddff3a8e4e5ec70a6df16bd Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Mon, 14 Oct 2019 13:43:09 +0800 Subject: mkl-dnn: upgrade v1.0.2 -> v1.1 Added third party license info: CMake, 3-clause BSD licenseq Copyright 2000-2019 Kitware, Inc. and Contributors See full license text in cmake/Copyright.txt MathJax, Apache License 2.0 Copyright (c) 2009-2018 The MathJax Consortium See full license text in doc/assets/mathjax/LICENSE Boost C++ Libraries, Boost Software License, Version 1.0 Copyright 2005-2014 Daniel James. See full license text in src/common/LICENSE_1_0 Release highlights can be found here: https://github.com/intel/mkl-dnn/releases/tag/v1.1 Note: Starting with this release (version 1.1) the library is renamed to DNNL https://intel.github.io/mkl-dnn/dev_guide_transition_to_dnnl.html https://intel.github.io/mkl-dnn/dev_guide_transition_to_v1.html Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- recipes-core/mkl-dnn/mkl-dnn_1.0.2.bb | 49 -------------------------------- recipes-core/mkl-dnn/mkl-dnn_1.1.bb | 53 +++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 49 deletions(-) delete mode 100644 recipes-core/mkl-dnn/mkl-dnn_1.0.2.bb create mode 100644 recipes-core/mkl-dnn/mkl-dnn_1.1.bb diff --git a/recipes-core/mkl-dnn/mkl-dnn_1.0.2.bb b/recipes-core/mkl-dnn/mkl-dnn_1.0.2.bb deleted file mode 100644 index 9f726848..00000000 --- a/recipes-core/mkl-dnn/mkl-dnn_1.0.2.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=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 = "3289d3c06e07b55fdbec927461bd89f8989eff5d" -SRC_URI = "git://github.com/intel/mkl-dnn.git;branch=rls-v1.0 \ - file://run-ptest \ -" - -UPSTREAM_CHECK_GITTAGREGEX = "^v(?P(\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_1.1.bb b/recipes-core/mkl-dnn/mkl-dnn_1.1.bb new file mode 100644 index 00000000..799a58aa --- /dev/null +++ b/recipes-core/mkl-dnn/mkl-dnn_1.1.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=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 = "dc6c0f3897c910a6ccba7f1db1f8d6f318c04f16" +SRC_URI = "git://github.com/intel/mkl-dnn.git;branch=rls-v1.1 \ + file://run-ptest \ + " + +UPSTREAM_CHECK_GITTAGREGEX = "^v(?P(\d+(\.\d+)+))$" + +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