[v21.6] fix openvino and gst-gva so that openvino.m4 can be used in p…

…lace 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 <[email protected]> * [master] Upgrade Meson for Ubuntu-20.04 (#748) * Update Docker image README (#704) * update README * Update dockerfiles * meson version fix Co-authored-by: jhou5 <[email protected]> * [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 <[email protected]> * [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 <[email protected]> * [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 <[email protected]> * [master] Owt boost revert (#759) * Update Docker image README (#704) * update README * Update dockerfiles * revert boost for owt on centos7 Co-authored-by: jhou5 <[email protected]> * [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 <[email protected]> * [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 <[email protected]> * 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 <[email protected]> * [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 <[email protected]> * [master] Fix test config for vmaf (#770) * Update Docker image README (#704) * update README * Update dockerfiles * vmaf test config fix Co-authored-by: jhou5 <[email protected]> * [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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * [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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * openvino/dldt interchangability Co-authored-by: jhou5 <[email protected]>
OpenVisualCloud · Aug 4, 2021 · bd5fdd8 · bd5fdd8
1 parent 023bd5c
commit bd5fdd8
Show file tree

Hide file tree

Showing 28 changed files with 49 additions and 28 deletions.
diff --git a/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile b/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile
@@ -327,7 +327,10 @@ ARG OPENVINO_IE_DIR=/opt/intel/openvino/deployment_tools/inference_engine
 
 ENV IE_PLUGINS_PATH=${OPENVINO_IE_DIR}/lib/intel64
 ENV HDDL_INSTALL_DIR=${OPENVINO_IE_DIR}/external/hddl
-ENV InferenceEngine_DIR=${OPENVINO_IE_DIR}/share
+ENV InferenceEngine_DIR=/opt/intel/openvino/deploymet_tools/inference_engine/share
+ENV TBB_DIR=/opt/intel/openvino/deployment_tools/inference_engine/external/tbb/cmake
+ENV ngraph_DIR=/opt/intel/openvino/deployment_tools/ngraph/cmake
+
 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
 
 #Remove components of OpenVino that are not needed

diff --git a/VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile b/VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile
@@ -344,7 +344,10 @@ ARG OPENVINO_IE_DIR=/opt/intel/openvino/deployment_tools/inference_engine
 
 ENV IE_PLUGINS_PATH=${OPENVINO_IE_DIR}/lib/intel64
 ENV HDDL_INSTALL_DIR=${OPENVINO_IE_DIR}/external/hddl
-ENV InferenceEngine_DIR=${OPENVINO_IE_DIR}/share
+ENV InferenceEngine_DIR=/opt/intel/openvino/deploymet_tools/inference_engine/share
+ENV TBB_DIR=/opt/intel/openvino/deployment_tools/inference_engine/external/tbb/cmake
+ENV ngraph_DIR=/opt/intel/openvino/deployment_tools/ngraph/cmake
+
 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
 
 #Remove components of OpenVino that are not needed

diff --git a/VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile b/VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile
@@ -338,7 +338,10 @@ ARG OPENVINO_IE_DIR=/opt/intel/openvino/deployment_tools/inference_engine
 
 ENV IE_PLUGINS_PATH=${OPENVINO_IE_DIR}/lib/intel64
 ENV HDDL_INSTALL_DIR=${OPENVINO_IE_DIR}/external/hddl
-ENV InferenceEngine_DIR=${OPENVINO_IE_DIR}/share
+ENV InferenceEngine_DIR=/opt/intel/openvino/deploymet_tools/inference_engine/share
+ENV TBB_DIR=/opt/intel/openvino/deployment_tools/inference_engine/external/tbb/cmake
+ENV ngraph_DIR=/opt/intel/openvino/deployment_tools/ngraph/cmake
+
 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
 
 #Remove components of OpenVino that are not needed

diff --git a/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile b/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile
@@ -313,7 +313,10 @@ ARG OPENVINO_IE_DIR=/opt/intel/openvino/deployment_tools/inference_engine
 
 ENV IE_PLUGINS_PATH=${OPENVINO_IE_DIR}/lib/intel64
 ENV HDDL_INSTALL_DIR=${OPENVINO_IE_DIR}/external/hddl
-ENV InferenceEngine_DIR=${OPENVINO_IE_DIR}/share
+ENV InferenceEngine_DIR=/opt/intel/openvino/deploymet_tools/inference_engine/share
+ENV TBB_DIR=/opt/intel/openvino/deployment_tools/inference_engine/external/tbb/cmake
+ENV ngraph_DIR=/opt/intel/openvino/deployment_tools/ngraph/cmake
+
 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
 
 #Remove components of OpenVino that are not needed

diff --git a/VCAC-A/ubuntu-20.04/analytics/ffmpeg/Dockerfile b/VCAC-A/ubuntu-20.04/analytics/ffmpeg/Dockerfile
@@ -318,7 +318,10 @@ ARG OPENVINO_IE_DIR=/opt/intel/openvino/deployment_tools/inference_engine
 
 ENV IE_PLUGINS_PATH=${OPENVINO_IE_DIR}/lib/intel64
 ENV HDDL_INSTALL_DIR=${OPENVINO_IE_DIR}/external/hddl
-ENV InferenceEngine_DIR=${OPENVINO_IE_DIR}/share
+ENV InferenceEngine_DIR=/opt/intel/openvino/deploymet_tools/inference_engine/share
+ENV TBB_DIR=/opt/intel/openvino/deployment_tools/inference_engine/external/tbb/cmake
+ENV ngraph_DIR=/opt/intel/openvino/deployment_tools/ngraph/cmake
+
 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
 
 #Remove components of OpenVino that are not needed

diff --git a/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile b/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile
@@ -324,7 +324,10 @@ ARG OPENVINO_IE_DIR=/opt/intel/openvino/deployment_tools/inference_engine
 
 ENV IE_PLUGINS_PATH=${OPENVINO_IE_DIR}/lib/intel64
 ENV HDDL_INSTALL_DIR=${OPENVINO_IE_DIR}/external/hddl
-ENV InferenceEngine_DIR=${OPENVINO_IE_DIR}/share
+ENV InferenceEngine_DIR=/opt/intel/openvino/deploymet_tools/inference_engine/share
+ENV TBB_DIR=/opt/intel/openvino/deployment_tools/inference_engine/external/tbb/cmake
+ENV ngraph_DIR=/opt/intel/openvino/deployment_tools/ngraph/cmake
+
 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
 
 #Remove components of OpenVino that are not needed

diff --git a/Xeon/centos-7/analytics/dev/Dockerfile b/Xeon/centos-7/analytics/dev/Dockerfile
@@ -693,7 +693,7 @@ ENV GST_PLUGIN_SCANNER=/usr/local/lib64/gstreamer-1.0/gst-plugin-scanner
 ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
 ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
 RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
-ENV LD_LIBRARY_PATH=/usr/local/lib64/gstreamer-1.0/
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib64/gstreamer-1.0/
 ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib64/girepository-1.0/ 
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
 ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib64/gstreamer-1.0/

diff --git a/Xeon/centos-7/analytics/gst/Dockerfile b/Xeon/centos-7/analytics/gst/Dockerfile
@@ -706,7 +706,7 @@ ENV GST_PLUGIN_SCANNER=/usr/local/lib64/gstreamer-1.0/gst-plugin-scanner
 ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
 ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
 RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
-ENV LD_LIBRARY_PATH=/usr/local/lib64/gstreamer-1.0/
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib64/gstreamer-1.0/
 ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib64/girepository-1.0/ 
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
 ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib64/gstreamer-1.0/

diff --git a/Xeon/centos-7/service/owt-dev/Dockerfile b/Xeon/centos-7/service/owt-dev/Dockerfile
@@ -759,7 +759,7 @@ ENV GST_PLUGIN_SCANNER=/usr/local/lib64/gstreamer-1.0/gst-plugin-scanner
 ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
 ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
 RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
-ENV LD_LIBRARY_PATH=/usr/local/lib64/gstreamer-1.0/
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib64/gstreamer-1.0/
 ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib64/girepository-1.0/ 
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
 ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib64/gstreamer-1.0/

diff --git a/Xeon/centos-7/service/owt/Dockerfile b/Xeon/centos-7/service/owt/Dockerfile
@@ -766,7 +766,7 @@ ENV GST_PLUGIN_SCANNER=/usr/local/lib64/gstreamer-1.0/gst-plugin-scanner
 ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
 ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
 RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
-ENV LD_LIBRARY_PATH=/usr/local/lib64/gstreamer-1.0/
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib64/gstreamer-1.0/
 ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib64/girepository-1.0/ 
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
 ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib64/gstreamer-1.0/

diff --git a/Xeon/ubuntu-18.04/analytics/dev/Dockerfile b/Xeon/ubuntu-18.04/analytics/dev/Dockerfile
@@ -778,7 +778,7 @@ ENV GST_PLUGIN_SCANNER=/usr/local/lib/gstreamer-1.0/gst-plugin-scanner
 ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
 ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
 RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
-ENV LD_LIBRARY_PATH=/usr/local/lib/gstreamer-1.0/
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/gstreamer-1.0/
 ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib/girepository-1.0/ 
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
 ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib/gstreamer-1.0/

diff --git a/Xeon/ubuntu-18.04/analytics/gst/Dockerfile b/Xeon/ubuntu-18.04/analytics/gst/Dockerfile
@@ -794,7 +794,7 @@ ENV GST_PLUGIN_SCANNER=/usr/local/lib/gstreamer-1.0/gst-plugin-scanner
 ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
 ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
 RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
-ENV LD_LIBRARY_PATH=/usr/local/lib/gstreamer-1.0/
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/gstreamer-1.0/
 ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib/girepository-1.0/ 
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
 ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib/gstreamer-1.0/

diff --git a/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile b/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile
@@ -800,7 +800,7 @@ ENV GST_PLUGIN_SCANNER=/usr/local/lib/gstreamer-1.0/gst-plugin-scanner
 ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
 ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
 RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
-ENV LD_LIBRARY_PATH=/usr/local/lib/gstreamer-1.0/
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/gstreamer-1.0/
 ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib/girepository-1.0/ 
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
 ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib/gstreamer-1.0/

diff --git a/Xeon/ubuntu-18.04/service/owt/Dockerfile b/Xeon/ubuntu-18.04/service/owt/Dockerfile
@@ -807,7 +807,7 @@ ENV GST_PLUGIN_SCANNER=/usr/local/lib/gstreamer-1.0/gst-plugin-scanner
 ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
 ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
 RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
-ENV LD_LIBRARY_PATH=/usr/local/lib/gstreamer-1.0/
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/gstreamer-1.0/
 ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib/girepository-1.0/ 
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
 ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib/gstreamer-1.0/

diff --git a/Xeon/ubuntu-20.04/analytics/dev/Dockerfile b/Xeon/ubuntu-20.04/analytics/dev/Dockerfile
@@ -764,7 +764,7 @@ ENV GST_PLUGIN_SCANNER=/usr/local/lib/gstreamer-1.0/gst-plugin-scanner
 ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
 ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
 RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
-ENV LD_LIBRARY_PATH=/usr/local/lib/gstreamer-1.0/
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/gstreamer-1.0/
 ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib/girepository-1.0/ 
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
 ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib/gstreamer-1.0/

diff --git a/Xeon/ubuntu-20.04/analytics/gst/Dockerfile b/Xeon/ubuntu-20.04/analytics/gst/Dockerfile
@@ -780,7 +780,7 @@ ENV GST_PLUGIN_SCANNER=/usr/local/lib/gstreamer-1.0/gst-plugin-scanner
 ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
 ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
 RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
-ENV LD_LIBRARY_PATH=/usr/local/lib/gstreamer-1.0/
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/gstreamer-1.0/
 ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib/girepository-1.0/ 
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
 ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib/gstreamer-1.0/

diff --git a/XeonE3/centos-7/analytics/dev/Dockerfile b/XeonE3/centos-7/analytics/dev/Dockerfile
@@ -789,7 +789,7 @@ ENV GST_VAAPI_ALL_DRIVERS=1
 ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
 ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
 RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
-ENV LD_LIBRARY_PATH=/usr/local/lib64/gstreamer-1.0/
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib64/gstreamer-1.0/
 ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib64/girepository-1.0/ 
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
 ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib64/gstreamer-1.0/

diff --git a/XeonE3/centos-7/analytics/gst/Dockerfile b/XeonE3/centos-7/analytics/gst/Dockerfile
@@ -778,7 +778,7 @@ ENV GST_VAAPI_ALL_DRIVERS=1
 ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
 ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
 RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
-ENV LD_LIBRARY_PATH=/usr/local/lib64/gstreamer-1.0/
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib64/gstreamer-1.0/
 ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib64/girepository-1.0/ 
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
 ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib64/gstreamer-1.0/

diff --git a/XeonE3/centos-7/service/owt-dev/Dockerfile b/XeonE3/centos-7/service/owt-dev/Dockerfile
@@ -812,7 +812,7 @@ ENV GST_PLUGIN_SCANNER=/usr/local/lib64/gstreamer-1.0/gst-plugin-scanner
 ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
 ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
 RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
-ENV LD_LIBRARY_PATH=/usr/local/lib64/gstreamer-1.0/
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib64/gstreamer-1.0/
 ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib64/girepository-1.0/ 
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
 ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib64/gstreamer-1.0/

diff --git a/XeonE3/centos-7/service/owt/Dockerfile b/XeonE3/centos-7/service/owt/Dockerfile
@@ -819,7 +819,7 @@ ENV GST_PLUGIN_SCANNER=/usr/local/lib64/gstreamer-1.0/gst-plugin-scanner
 ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
 ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
 RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
-ENV LD_LIBRARY_PATH=/usr/local/lib64/gstreamer-1.0/
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib64/gstreamer-1.0/
 ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib64/girepository-1.0/ 
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
 ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib64/gstreamer-1.0/

diff --git a/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile b/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile
@@ -910,7 +910,7 @@ ENV GST_VAAPI_ALL_DRIVERS=1
 ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
 ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
 RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
-ENV LD_LIBRARY_PATH=/usr/local/lib/gstreamer-1.0/
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/gstreamer-1.0/
 ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib/girepository-1.0/ 
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
 ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib/gstreamer-1.0/

diff --git a/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile b/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile
@@ -899,7 +899,7 @@ ENV GST_VAAPI_ALL_DRIVERS=1
 ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
 ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
 RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
-ENV LD_LIBRARY_PATH=/usr/local/lib/gstreamer-1.0/
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/gstreamer-1.0/
 ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib/girepository-1.0/ 
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
 ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib/gstreamer-1.0/

diff --git a/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile b/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile
@@ -874,7 +874,7 @@ ENV GST_PLUGIN_SCANNER=/usr/local/lib/gstreamer-1.0/gst-plugin-scanner
 ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
 ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
 RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
-ENV LD_LIBRARY_PATH=/usr/local/lib/gstreamer-1.0/
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/gstreamer-1.0/
 ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib/girepository-1.0/ 
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
 ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib/gstreamer-1.0/

diff --git a/XeonE3/ubuntu-18.04/service/owt/Dockerfile b/XeonE3/ubuntu-18.04/service/owt/Dockerfile
@@ -881,7 +881,7 @@ ENV GST_PLUGIN_SCANNER=/usr/local/lib/gstreamer-1.0/gst-plugin-scanner
 ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
 ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
 RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
-ENV LD_LIBRARY_PATH=/usr/local/lib/gstreamer-1.0/
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/gstreamer-1.0/
 ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib/girepository-1.0/ 
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
 ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib/gstreamer-1.0/

diff --git a/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile b/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile
@@ -896,7 +896,7 @@ ENV GST_VAAPI_ALL_DRIVERS=1
 ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
 ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
 RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
-ENV LD_LIBRARY_PATH=/usr/local/lib/gstreamer-1.0/
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/gstreamer-1.0/
 ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib/girepository-1.0/ 
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
 ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib/gstreamer-1.0/

diff --git a/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile b/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile
@@ -885,7 +885,7 @@ ENV GST_VAAPI_ALL_DRIVERS=1
 ARG CUSTOM_IE_DIR=/usr/local/openvino/inference-engine
 ARG CUSTOM_IE_LIBDIR=${CUSTOM_IE_DIR}/lib/intel64
 RUN printf "${CUSTOM_IE_LIBDIR}\n${CUSTOM_IE_DIR}/external/tbb/lib\n" >/etc/ld.so.conf.d/openvino.conf && ldconfig
-ENV LD_LIBRARY_PATH=/usr/local/lib/gstreamer-1.0/
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/gstreamer-1.0/
 ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:/usr/local/lib/girepository-1.0/ 
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
 ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib/gstreamer-1.0/

diff --git a/template/components/gst-gva.m4 b/template/components/gst-gva.m4
@@ -103,7 +103,7 @@ RUN mkdir -p BUILD_DESTDIR/opt/intel/dl_streamer/python && \
 ')
 
 define(`INSTALL_GVA',
-ENV LD_LIBRARY_PATH=BUILD_LIBDIR/gstreamer-1.0/
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:BUILD_LIBDIR/gstreamer-1.0/
 ENV GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:BUILD_LIBDIR/girepository-1.0/ 
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
 ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:BUILD_LIBDIR/gstreamer-1.0/

diff --git a/template/components/openvino.m4 b/template/components/openvino.m4
@@ -72,7 +72,10 @@ ARG OPENVINO_IE_DIR=/opt/intel/openvino/deployment_tools/inference_engine
 
 ENV IE_PLUGINS_PATH=${OPENVINO_IE_DIR}/lib/intel64
 ENV HDDL_INSTALL_DIR=${OPENVINO_IE_DIR}/external/hddl
-ENV InferenceEngine_DIR=${OPENVINO_IE_DIR}/share
+ENV InferenceEngine_DIR=/opt/intel/openvino/deploymet_tools/inference_engine/share
+ENV TBB_DIR=/opt/intel/openvino/deployment_tools/inference_engine/external/tbb/cmake
+ENV ngraph_DIR=/opt/intel/openvino/deployment_tools/ngraph/cmake
+
 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
 
 #Remove components of OpenVino that are not needed