From 4684c50cb9b6630073519c8286a84f5ea4f6ddf9 Mon Sep 17 00:00:00 2001 From: Chin Huat Ang Date: Mon, 21 Oct 2019 13:17:52 +0800 Subject: dldt-inference-engine: build clDNN against opencl-icd-loader Instead of letting clDNN build against intel_ocl_icd prebuilt binaries under clDNN/common/intel_ocl_icd, configure cmake build to pick up opencl-icd-loader headers and libraries from staging directory. Do not set CMAKE_INSTALL_LOCAL_ONLY as it is unused. Signed-off-by: Chin Huat Ang Signed-off-by: Anuj Mittal --- .../recipes-support/opencv/dldt-inference-engine_2019r3.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'dynamic-layers') diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.bb index 21b5198d..bca4c545 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.bb @@ -31,7 +31,6 @@ EXTRA_OECMAKE += " \ -DENABLE_GNA=0 \ -DPYTHON_EXECUTABLE=${PYTHON} \ -DTHREADING=TBB \ - -DCMAKE_INSTALL_LOCAL_ONLY=OFF \ -DCMAKE_BUILD_TYPE=DebugWithRelInfo \ -DNGRAPH_INCLUDES=${STAGING_INCDIR}/ngraph \ -DENABLE_TESTS="${@bb.utils.contains('PTEST_ENABLED', '1', '1', '0', d)}" \ @@ -54,7 +53,7 @@ COMPATIBLE_HOST = '(x86_64).*-linux' COMPATIBLE_HOST_libc-musl = "null" PACKAGECONFIG ?= "" -PACKAGECONFIG[opencl] = "-DENABLE_CLDNN=1, -DENABLE_CLDNN=0, opencl-icd-loader, opencl-icd-loader intel-compute-runtime" +PACKAGECONFIG[opencl] = "-DENABLE_CLDNN=1 -DCLDNN__IOCL_ICD_INCDIRS=${STAGING_INCDIR} -DCLDNN__IOCL_ICD_STLDIRS=${STAGING_LIBDIR} -DCLDNN__IOCL_ICD_SHLDIRS=${STAGING_LIBDIR}, -DENABLE_CLDNN=0, opencl-icd-loader, opencl-icd-loader intel-compute-runtime" PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}, -DENABLE_PYTHON=OFF, python3-cython-native, python3" do_install_ptest_base_prepend() { -- cgit v1.2.3-54-g00ecf