[meta-intel] [PATCH] dldt-inference-engine: add PACKAGECONFIG for myriad plugin

[Martin Jansa]

I think MYRIAD is already enabled by default:
https://github.com/opencv/dldt/blob/2019/inference-engine/cmake/features.cmake#L48
when not disabled together with VPU:
https://github.com/opencv/dldt/blob/2019/inference-engine/cmake/check_features.cmake#L42

so I'm not sure if we need 2 PACKAGECONFIGs for that.

Also using 8 spaces for indentation is inconsistent with everything else,
oe-core is using tabs for shell tasks and 4 spaces for python task, most
other layers are using 4 spaces everywhere (worst cases combine both in the
same task - e.g. do_install_ptest_base_prepend in this recipe).

Regards,

On Fri, Oct 25, 2019 at 3:37 PM Anuj Mittal <anuj.mittal at intel.com> wrote:

> Add option to build myriad plugin [1] and enable it by default. Also
> make sure that USB udev rules for Intel(R) Movidius(TM) Neural Compute
> Stick and Intel(R) Neural Compute Stick 2 are packaged.
>
> [1]
> https://docs.openvinotoolkit.org/latest/_docs_IE_DG_supported_plugins_MYRIAD.html
>
> Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
> ---
>  .../opencv/dldt-inference-engine_2019r3.bb         | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
>
> 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 ff59b515..2ea263da 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
> @@ -67,16 +67,22 @@ DEPENDS += "libusb1 \
>  COMPATIBLE_HOST = '(x86_64).*-linux'
>  COMPATIBLE_HOST_libc-musl = "null"
>
> -PACKAGECONFIG ?= ""
> +PACKAGECONFIG ?= "vpu myriad"
>  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"
>  PACKAGECONFIG[vpu] = "-DENABLE_VPU=ON
> -DVPU_FIRMWARE_MA2450_FILE=../mvnc/MvNCAPI-ma2450.mvcmd
> -DVPU_FIRMWARE_MA2X8X_FILE=../mvnc/MvNCAPI-ma2x8x.mvcmd
> -DVPU_FIRMWARE_MV0262_FILE=../mvnc/MvNCAPI-mv0262.mvcmd,-DENABLE_VPU=OFF,,${PN}-vpu-firmware"
>  PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0"
> +# Note that myriad would need vpu to be enabled too
> +PACKAGECONFIG[myriad] = "-DENABLE_MYRIAD=ON, -DENABLE_MYRIAD=OFF"
>
>  do_install_append() {
> -    install -m0644 ${WORKDIR}/mvnc/MvNCAPI-ma2450.mvcmd ${D}${libdir}
> -    install -m0644 ${WORKDIR}/mvnc/MvNCAPI-ma2x8x.mvcmd ${D}${libdir}
> -    install -m0644 ${WORKDIR}/mvnc/MvNCAPI-mv0262.mvcmd ${D}${libdir}
> +        install -m0644 ${WORKDIR}/mvnc/MvNCAPI-ma2450.mvcmd ${D}${libdir}
> +        install -m0644 ${WORKDIR}/mvnc/MvNCAPI-ma2x8x.mvcmd ${D}${libdir}
> +        install -m0644 ${WORKDIR}/mvnc/MvNCAPI-mv0262.mvcmd ${D}${libdir}
> +
> +        if ${@bb.utils.contains('PACKAGECONFIG', 'myriad', 'true',
> 'false', d)}; then
> +                install -D -m0644
> ${S}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules
> ${D}${sysconfdir}/udev/rules.d/97-myriad-usbboot.rules
> +        fi
>  }
>
>  do_install_ptest_base_prepend() {
> --
> 2.21.0
>
> --
> _______________________________________________
> meta-intel mailing list
> meta-intel at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-intel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/meta-intel/attachments/20191025/7b34afca/attachment-0001.html>