diff options
-rw-r--r-- | conf/include/maintainers.inc | 1 | ||||
-rw-r--r-- | recipes-devtools/ngraph/ngraph/0001-install-cmake-modules-correctly.patch | 54 | ||||
-rw-r--r-- | recipes-devtools/ngraph/ngraph_0.29.0-rc0.bb | 34 |
3 files changed, 0 insertions, 89 deletions
diff --git a/conf/include/maintainers.inc b/conf/include/maintainers.inc index f8e1da7f..90c39e4e 100644 --- a/conf/include/maintainers.inc +++ b/conf/include/maintainers.inc | |||
@@ -30,7 +30,6 @@ RECIPE_MAINTAINER_pn-linux-intel-dev = "Naveen Saini <naveen.kumar.saini@intel.c | |||
30 | RECIPE_MAINTAINER_pn-lms = "Anuj Mittal <anuj.mittal@intel.com>" | 30 | RECIPE_MAINTAINER_pn-lms = "Anuj Mittal <anuj.mittal@intel.com>" |
31 | RECIPE_MAINTAINER_pn-metee = "Naveen Saini <naveen.kumar.saini@intel.com>" | 31 | RECIPE_MAINTAINER_pn-metee = "Naveen Saini <naveen.kumar.saini@intel.com>" |
32 | RECIPE_MAINTAINER_pn-metrics-discovery = "Naveen Saini <naveen.kumar.saini@intel.com>" | 32 | RECIPE_MAINTAINER_pn-metrics-discovery = "Naveen Saini <naveen.kumar.saini@intel.com>" |
33 | RECIPE_MAINTAINER_pn-ngraph = "Anuj Mittal <anuj.mittal@intel.com>" | ||
34 | RECIPE_MAINTAINER_pn-onednn = "Naveen Saini <naveen.kumar.saini@intel.com>" | 33 | RECIPE_MAINTAINER_pn-onednn = "Naveen Saini <naveen.kumar.saini@intel.com>" |
35 | RECIPE_MAINTAINER_pn-open-model-zoo = "Anuj Mittal <anuj.mittal@intel.com>" | 34 | RECIPE_MAINTAINER_pn-open-model-zoo = "Anuj Mittal <anuj.mittal@intel.com>" |
36 | RECIPE_MAINTAINER_pn-opencl-clang = "Naveen Saini <naveen.kumar.saini@intel.com>" | 35 | RECIPE_MAINTAINER_pn-opencl-clang = "Naveen Saini <naveen.kumar.saini@intel.com>" |
diff --git a/recipes-devtools/ngraph/ngraph/0001-install-cmake-modules-correctly.patch b/recipes-devtools/ngraph/ngraph/0001-install-cmake-modules-correctly.patch deleted file mode 100644 index c8e5095f..00000000 --- a/recipes-devtools/ngraph/ngraph/0001-install-cmake-modules-correctly.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | From a03058ed605345cce9d7f0cd98f7c3696c3d7c51 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Tue, 7 Apr 2020 13:44:37 +0800 | ||
4 | Subject: [PATCH] fix installation of cmake modules | ||
5 | |||
6 | Make sure that cmake files are installed correctly and don't install | ||
7 | license files. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
12 | --- | ||
13 | CMakeLists.txt | 14 ++++---------- | ||
14 | 1 file changed, 4 insertions(+), 10 deletions(-) | ||
15 | |||
16 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
17 | index 604daa0e45..b60a013b86 100644 | ||
18 | --- a/CMakeLists.txt | ||
19 | +++ b/CMakeLists.txt | ||
20 | @@ -667,12 +667,12 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) | ||
21 | install(EXPORT ngraphTargets | ||
22 | FILE ngraphTargets.cmake | ||
23 | NAMESPACE ngraph:: | ||
24 | - DESTINATION cmake | ||
25 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph | ||
26 | COMPONENT ngraph) | ||
27 | |||
28 | configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/share/ngraphConfig.cmake.in | ||
29 | ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake | ||
30 | - INSTALL_DESTINATION cmake) | ||
31 | + INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph) | ||
32 | |||
33 | write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake | ||
34 | VERSION ${NGRAPH_VERSION} | ||
35 | @@ -680,14 +680,8 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) | ||
36 | |||
37 | install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake | ||
38 | ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake | ||
39 | - DESTINATION cmake | ||
40 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph | ||
41 | COMPONENT ngraph) | ||
42 | endif() | ||
43 | |||
44 | -install(DIRECTORY | ||
45 | - ${CMAKE_CURRENT_SOURCE_DIR}/licenses | ||
46 | - DESTINATION "." | ||
47 | - COMPONENT ngraph | ||
48 | -) | ||
49 | -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION "." COMPONENT ngraph) | ||
50 | -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION DESTINATION "." COMPONENT ngraph) | ||
51 | +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ngraph COMPONENT ngraph) | ||
52 | -- | ||
53 | 2.25.2 | ||
54 | |||
diff --git a/recipes-devtools/ngraph/ngraph_0.29.0-rc0.bb b/recipes-devtools/ngraph/ngraph_0.29.0-rc0.bb deleted file mode 100644 index e0170681..00000000 --- a/recipes-devtools/ngraph/ngraph_0.29.0-rc0.bb +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | SUMMARY = "nGraph Compiler Stack" | ||
2 | DESCRIPTION = "nGraph Compiler aims to accelerate developing AI workloads using \ | ||
3 | any deep learning framework and deploying to a variety of \ | ||
4 | hardware targets." | ||
5 | HOMEPAGE = "https://www.ngraph.ai" | ||
6 | |||
7 | SRC_URI = "git://github.com/NervanaSystems/ngraph.git;protocol=https \ | ||
8 | file://0001-install-cmake-modules-correctly.patch \ | ||
9 | " | ||
10 | |||
11 | SRCREV = "b8419c354e5fc70805f1501d7dfff533ac790bec" | ||
12 | |||
13 | LICENSE = "Apache-2.0" | ||
14 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | ||
15 | |||
16 | S = "${WORKDIR}/git" | ||
17 | |||
18 | inherit cmake | ||
19 | |||
20 | OECMAKE_GENERATOR = "Unix Makefiles" | ||
21 | |||
22 | EXTRA_OECMAKE += " \ | ||
23 | -DNGRAPH_CPU_ENABLE=FALSE \ | ||
24 | -DNGRAPH_UNIT_TEST_ENABLE=FALSE \ | ||
25 | -DNGRAPH_TEST_UTIL_ENABLE=FALSE \ | ||
26 | -DNGRAPH_INTERPRETER_ENABLE=FALSE \ | ||
27 | -DNGRAPH_JSON_ENABLE=FALSE \ | ||
28 | -DNGRAPH_NATIVE_ARCH_ENABLE=FALSE \ | ||
29 | -DNGRAPH_TOOLS_ENABLE=FALSE \ | ||
30 | -DNGRAPH_NOP_ENABLE=FALSE \ | ||
31 | -DNGRAPH_GENERIC_CPU_ENABLE=FALSE \ | ||
32 | -DNGRAPH_LIB_VERSIONING_ENABLE=TRUE \ | ||
33 | -DNGRAPH_CURRENT_RELEASE_TAG=0.29.0-rc0 \ | ||
34 | " | ||