Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit bd5fdd8

Browse files
dpatel257jhou5
dpatel257
and
jhou5
authored
[v21.6] fix openvino and gst-gva so that openvino.m4 can be used in place of dldt-ie.m4 (#786)
* Update Docker image README (#704) * update README * Update dockerfiles * [master] Fix Opencv 4.5.2 build with Toolset on Centos 7 (#746) * Update Docker image README (#704) * update README * Update dockerfiles * fix opencv 4.5.2 build with toolset Co-authored-by: jhou5 <jingdu.hou@intel.com> * [master] Upgrade Meson for Ubuntu-20.04 (#748) * Update Docker image README (#704) * update README * Update dockerfiles * meson version fix Co-authored-by: jhou5 <jingdu.hou@intel.com> * [master] Test fixes for Release v21.6 - part 1 (#750) * Update Docker image README (#704) * update README * Update dockerfiles * v216 tests update - part 1 Co-authored-by: jhou5 <jingdu.hou@intel.com> * [master] Test fixes for Release v21.6 - part 2 (#755) * Update Docker image README (#704) * update README * Update dockerfiles * v216 tests update - part 1 * Test fixes for Release v21.6 - part 2 Co-authored-by: jhou5 <jingdu.hou@intel.com> * [master] Bug fixes for Release v21.6 (#757) * Update Docker image README (#704) * update README * Update dockerfiles * Bug fixes for v21.6. See details - QAT Engine build param fix - revert scvp change for owt360 - test name change for proper injection of tests - devoolset opencv fix - nginx conf sw_fallback off * revert accidental fdkaac change Co-authored-by: jhou5 <jingdu.hou@intel.com> * [master] Owt boost revert (#759) * Update Docker image README (#704) * update README * Update dockerfiles * revert boost for owt on centos7 Co-authored-by: jhou5 <jingdu.hou@intel.com> * [master] Fix Ipsec caused u2004 bug (#762) * Update Docker image README (#704) * update README * Update dockerfiles * fix ipsecmb caused system fault in u2004 Co-authored-by: jhou5 <jingdu.hou@intel.com> * [master] Dldt Video Analytics test fix (#764) * Update Docker image README (#704) * update README * Update dockerfiles * fix dldt gva tests broken by links Co-authored-by: jhou5 <jingdu.hou@intel.com> * Ubuntu 20.04 fix for vaapi failures (#766) * Update Docker image README (#704) * update README * Update dockerfiles * fix u2004 images for vaapi due to lib change Co-authored-by: jhou5 <jingdu.hou@intel.com> * [master] License Triggered changes from PDT feedback (#768) * Update Docker image README (#704) * update README * Update dockerfiles * ffmpeg/openssl/libvmaf license related changes * ffmpeg-nonfree change * restructure gpl flag * gpl changes for 264/265 properly * re-add the components needed for 264/265 building & test changes Co-authored-by: jhou5 <jingdu.hou@intel.com> * [master] Fix test config for vmaf (#770) * Update Docker image README (#704) * update README * Update dockerfiles * vmaf test config fix Co-authored-by: jhou5 <jingdu.hou@intel.com> * [master] Don't Load 264 tests for nginx dev images (#772) * Update Docker image README (#704) * update README * Update dockerfiles * nginx test load change for dev images Co-authored-by: jhou5 <jingdu.hou@intel.com> * Doc changes for 21.6 * [master] Document updates for release 216 (#774) * Update Docker image README (#704) * update README * Update dockerfiles * Doc changes for 21.6 Co-authored-by: jhou5 <jingdu.hou@intel.com> * push dockerfiles remaining changes * [master] Push left over changes to master (#776) * Update Docker image README (#704) * update README * Update dockerfiles * Doc changes for 21.6 * push dockerfiles remaining changes Co-authored-by: jhou5 <jingdu.hou@intel.com> * [master] QAT readme update & yasm repo change (#777) * Update Docker image README (#704) * update README * Update dockerfiles * Doc changes for 21.6 * push dockerfiles remaining changes * QAT readme change and yasm fix Co-authored-by: jhou5 <jingdu.hou@intel.com> * README version changes for 21.6 * [master] Readme version update for 216 (#779) * Update Docker image README (#704) * update README * Update dockerfiles * Doc changes for 21.6 * push dockerfiles remaining changes * README version changes for 21.6 * adding links to QAT NGINX_SW Images Co-authored-by: jhou5 <jingdu.hou@intel.com> * Enable Nonfree for ffmpeg when fdkaac is enabled (#781) * Update Docker image README (#704) * update README * Update dockerfiles * Doc changes for 21.6 * push dockerfiles remaining changes * README version changes for 21.6 * enable non-free if fdkaac is enabled Co-authored-by: jhou5 <jingdu.hou@intel.com> * openvino/dldt interchangability Co-authored-by: jhou5 <jingdu.hou@intel.com>
1 parent 023bd5c commit bd5fdd8

28 files changed

Lines changed: 49 additions & 28 deletions

File tree

‎VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,10 @@ ARG OPENVINO_IE_DIR=/opt/intel/openvino/deployment_tools/inference_engine
327327

328328
ENV IE_PLUGINS_PATH=${OPENVINO_IE_DIR}/lib/intel64
329329
ENV HDDL_INSTALL_DIR=${OPENVINO_IE_DIR}/external/hddl
330-
ENV InferenceEngine_DIR=${OPENVINO_IE_DIR}/share
330+
ENV InferenceEngine_DIR=/opt/intel/openvino/deploymet_tools/inference_engine/share
331+
ENV TBB_DIR=/opt/intel/openvino/deployment_tools/inference_engine/external/tbb/cmake
332+
ENV ngraph_DIR=/opt/intel/openvino/deployment_tools/ngraph/cmake
333+
331334
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/intel/openvino/deployment_tools/ngraph/lib:/opt/intel/opencl:$HDDL_INSTALL_DIR/lib:${OPENVINO_IE_DIR}/external/gna/lib:${OPENVINO_IE_DIR}/external/mkltiny_lnx/lib:${OPENVINO_IE_DIR}/external/omp/lib:${OPENVINO_IE_DIR}/external/tbb/lib:/opt/intel/openvino/openvx/lib:$IE_PLUGINS_PATH
332335

333336
#Remove components of OpenVino that are not needed

‎VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,10 @@ ARG OPENVINO_IE_DIR=/opt/intel/openvino/deployment_tools/inference_engine
344344

345345
ENV IE_PLUGINS_PATH=${OPENVINO_IE_DIR}/lib/intel64
346346
ENV HDDL_INSTALL_DIR=${OPENVINO_IE_DIR}/external/hddl
347-
ENV InferenceEngine_DIR=${OPENVINO_IE_DIR}/share
347+
ENV InferenceEngine_DIR=/opt/intel/openvino/deploymet_tools/inference_engine/share
348+
ENV TBB_DIR=/opt/intel/openvino/deployment_tools/inference_engine/external/tbb/cmake
349+
ENV ngraph_DIR=/opt/intel/openvino/deployment_tools/ngraph/cmake
350+
348351
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/intel/openvino/deployment_tools/ngraph/lib:/opt/intel/opencl:$HDDL_INSTALL_DIR/lib:${OPENVINO_IE_DIR}/external/gna/lib:${OPENVINO_IE_DIR}/external/mkltiny_lnx/lib:${OPENVINO_IE_DIR}/external/omp/lib:${OPENVINO_IE_DIR}/external/tbb/lib:/opt/intel/openvino/openvx/lib:$IE_PLUGINS_PATH
349352

350353
#Remove components of OpenVino that are not needed

‎VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,10 @@ ARG OPENVINO_IE_DIR=/opt/intel/openvino/deployment_tools/inference_engine
338338

339339
ENV IE_PLUGINS_PATH=${OPENVINO_IE_DIR}/lib/intel64
340340
ENV HDDL_INSTALL_DIR=${OPENVINO_IE_DIR}/external/hddl
341-
ENV InferenceEngine_DIR=${OPENVINO_IE_DIR}/share
341+
ENV InferenceEngine_DIR=/opt/intel/openvino/deploymet_tools/inference_engine/share
342+
ENV TBB_DIR=/opt/intel/openvino/deployment_tools/inference_engine/external/tbb/cmake
343+
ENV ngraph_DIR=/opt/intel/openvino/deployment_tools/ngraph/cmake
344+
342345
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/intel/openvino/deployment_tools/ngraph/lib:/opt/intel/opencl:$HDDL_INSTALL_DIR/lib:${OPENVINO_IE_DIR}/external/gna/lib:${OPENVINO_IE_DIR}/external/mkltiny_lnx/lib:${OPENVINO_IE_DIR}/external/omp/lib:${OPENVINO_IE_DIR}/external/tbb/lib:/opt/intel/openvino/openvx/lib:$IE_PLUGINS_PATH
343346

344347
#Remove components of OpenVino that are not needed

‎VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,10 @@ ARG OPENVINO_IE_DIR=/opt/intel/openvino/deployment_tools/inference_engine
313313

314314
ENV IE_PLUGINS_PATH=${OPENVINO_IE_DIR}/lib/intel64
315315
ENV HDDL_INSTALL_DIR=${OPENVINO_IE_DIR}/external/hddl
316-
ENV InferenceEngine_DIR=${OPENVINO_IE_DIR}/share
316+
ENV InferenceEngine_DIR=/opt/intel/openvino/deploymet_tools/inference_engine/share
317+
ENV TBB_DIR=/opt/intel/openvino/deployment_tools/inference_engine/external/tbb/cmake
318+
ENV ngraph_DIR=/opt/intel/openvino/deployment_tools/ngraph/cmake
319+
317320
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/intel/openvino/deployment_tools/ngraph/lib:/opt/intel/opencl:$HDDL_INSTALL_DIR/lib:${OPENVINO_IE_DIR}/external/gna/lib:${OPENVINO_IE_DIR}/external/mkltiny_lnx/lib:${OPENVINO_IE_DIR}/external/omp/lib:${OPENVINO_IE_DIR}/external/tbb/lib:/opt/intel/openvino/openvx/lib:$IE_PLUGINS_PATH
318321

319322
#Remove components of OpenVino that are not needed

‎VCAC-A/ubuntu-20.04/analytics/ffmpeg/Dockerfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,10 @@ ARG OPENVINO_IE_DIR=/opt/intel/openvino/deployment_tools/inference_engine
318318

319319
ENV IE_PLUGINS_PATH=${OPENVINO_IE_DIR}/lib/intel64
320320
ENV HDDL_INSTALL_DIR=${OPENVINO_IE_DIR}/external/hddl
321-
ENV InferenceEngine_DIR=${OPENVINO_IE_DIR}/share
321+
ENV InferenceEngine_DIR=/opt/intel/openvino/deploymet_tools/inference_engine/share
322+
ENV TBB_DIR=/opt/intel/openvino/deployment_tools/inference_engine/external/tbb/cmake
323+
ENV ngraph_DIR=/opt/intel/openvino/deployment_tools/ngraph/cmake
324+
322325
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/intel/openvino/deployment_tools/ngraph/lib:/opt/intel/opencl:$HDDL_INSTALL_DIR/lib:${OPENVINO_IE_DIR}/external/gna/lib:${OPENVINO_IE_DIR}/external/mkltiny_lnx/lib:${OPENVINO_IE_DIR}/external/omp/lib:${OPENVINO_IE_DIR}/external/tbb/lib:/opt/intel/openvino/openvx/lib:$IE_PLUGINS_PATH
323326

324327
#Remove components of OpenVino that are not needed

‎VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,10 @@ ARG OPENVINO_IE_DIR=/opt/intel/openvino/deployment_tools/inference_engine
324324

325325
ENV IE_PLUGINS_PATH=${OPENVINO_IE_DIR}/lib/intel64
326326
ENV HDDL_INSTALL_DIR=${OPENVINO_IE_DIR}/external/hddl
327-
ENV InferenceEngine_DIR=${OPENVINO_IE_DIR}/share
327+
ENV InferenceEngine_DIR=/opt/intel/openvino/deploymet_tools/inference_engine/share
328+
ENV TBB_DIR=/opt/intel/openvino/deployment_tools/inference_engine/external/tbb/cmake
329+
ENV ngraph_DIR=/opt/intel/openvino/deployment_tools/ngraph/cmake
330+
328331
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/intel/openvino/deployment_tools/ngraph/lib:/opt/intel/opencl:$HDDL_INSTALL_DIR/lib:${OPENVINO_IE_DIR}/external/gna/lib:${OPENVINO_IE_DIR}/external/mkltiny_lnx/lib:${OPENVINO_IE_DIR}/external/omp/lib:${OPENVINO_IE_DIR}/external/tbb/lib:/opt/intel/openvino/openvx/lib:$IE_PLUGINS_PATH
329332

330333
#Remove components of OpenVino that are not needed

‎Xeon/centos-7/analytics/dev/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ ENV GST_PLUGIN_SCANNER=/usr/local/lib64/gstreamer-1.0/gst-plugin-scanner
693693
ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
694694
ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
695695
RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
696-
ENV LD_LIBRARY_PATH=/usr/local/lib64/gstreamer-1.0/
696+
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib64/gstreamer-1.0/
697697
ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib64/girepository-1.0/
698698
ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
699699
ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib64/gstreamer-1.0/

‎Xeon/centos-7/analytics/gst/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ ENV GST_PLUGIN_SCANNER=/usr/local/lib64/gstreamer-1.0/gst-plugin-scanner
706706
ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
707707
ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
708708
RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
709-
ENV LD_LIBRARY_PATH=/usr/local/lib64/gstreamer-1.0/
709+
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib64/gstreamer-1.0/
710710
ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib64/girepository-1.0/
711711
ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
712712
ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib64/gstreamer-1.0/

‎Xeon/centos-7/service/owt-dev/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ ENV GST_PLUGIN_SCANNER=/usr/local/lib64/gstreamer-1.0/gst-plugin-scanner
759759
ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
760760
ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
761761
RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
762-
ENV LD_LIBRARY_PATH=/usr/local/lib64/gstreamer-1.0/
762+
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib64/gstreamer-1.0/
763763
ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib64/girepository-1.0/
764764
ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
765765
ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib64/gstreamer-1.0/

‎Xeon/centos-7/service/owt/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,7 @@ ENV GST_PLUGIN_SCANNER=/usr/local/lib64/gstreamer-1.0/gst-plugin-scanner
766766
ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
767767
ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
768768
RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
769-
ENV LD_LIBRARY_PATH=/usr/local/lib64/gstreamer-1.0/
769+
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib64/gstreamer-1.0/
770770
ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib64/girepository-1.0/
771771
ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
772772
ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib64/gstreamer-1.0/

0 commit comments

Comments
 (0)