change for OV 2023.0 (#272)

Author: dtrawins

requirements.txt

@@ -1,8 +1,9 @@
 setuptools
 docker!=5.0.0,!=5.0.1 # workarounds for https://github.com/docker/docker-py/issues/2807 and 2885
 jinja2
-pytest
+pytest==7.1.3
+# https://github.com/pytest-dev/pytest/issues/10428
 pytest-html
 pytest-metadata
 pytest-xdist
-requests
+requests

requirements_dev.txt

@@ -24,7 +24,8 @@ flake8-rst-docstrings
 more-itertools
 packaging
 pluggy
-pytest
+pytest==7.1.3
+# https://github.com/pytest-dev/pytest/issues/10428
 pytest-html
 pytest-metadata
 pytest-xdist

templates/rhel8/common/base.dockerfile.j2

@@ -222,14 +222,6 @@ RUN yum update -y --excludepkgs redhat-release && rpm -qa --qf "%{name}\n" > bas
       echo "Download source for $(ls | wc -l) third-party packages: $(du -sh)"; fi && \
 	yum clean all && rm -rf /var/cache/yum
 
-{% if 'autobuild' != rhel_platform %}
-COPY ./entitlement /etc/pki/entitlement
-COPY ./rhsm-conf /etc/rhsm
-COPY ./rhsm-ca /etc/rhsm/ca
-{% endif %}
-# patch components with vulnerabilites
-RUN rm -f /etc/rhsm-host && yum upgrade -y wavpack gstreamer1-plugins-good && yum clean all && rm -rf /var/cache/yum
-
 {% if 'autobuild' != rhel_platform %}
 RUN  rm -Rf /etc/pki/entitlement /etc/rhsm/ca /etc/rhsm/rhsm.conf
 {% endif %}

templates/rhel8/dist/dev.dockerfile.j2

@@ -31,8 +31,8 @@ RUN  echo "export OpenCV_DIR=${INTEL_OPENVINO_DIR}/extras/opencv/cmake" | tee -a
 # build samples into ${INTEL_OPENVINO_DIR}/samples/cpp/samples_bin
 WORKDIR "${INTEL_OPENVINO_DIR}"/samples/cpp
 RUN ./build_samples.sh -b build && \
-    cp -R build/intel64/Release samples_bin && cp build/intel64/Release/libformat_reader.so . && \
-    rm -Rf build && mkdir -p build/intel64/Release/lib && mv libformat_reader.so build/intel64/Release/lib/ && rm -Rf samples_bin/lib/
+    cp -R build/intel64/Release samples_bin && \
+    rm -Rf build
 
 # add Model API package
 # hadolint ignore=DL3013

templates/rhel8/hw/gpu.dockerfile.j2

@@ -1,8 +1,11 @@
 # for GPU
 RUN groupmod -g 44 video
 
-# hadolint ignore=DL3031, DL3033
-WORKDIR ${INTEL_OPENVINO_DIR}/install_dependencies
-RUN ./install_NEO_OCL_driver.sh --no_numa -y && \
-    yum clean all && rm -rf /var/cache/yum && \
-    yum remove -y epel-release
+RUN dnf install -y libedit ; \
+    rpm -ivh https://repositories.intel.com/graphics/rhel/8.5/intel-gmmlib-22.1.7-i419.el8.x86_64.rpm ; \
+    rpm -ivh https://repositories.intel.com/graphics/rhel/8.5/intel-igc-core-1.0.11485-i419.el8.x86_64.rpm ; \
+    rpm -ivh https://repositories.intel.com/graphics/rhel/8.5/intel-igc-opencl-1.0.11485-i419.el8.x86_64.rpm ; \
+    rpm -ivh https://repositories.intel.com/graphics/rhel/8.5/intel-opencl-22.28.23726.1-i419.el8.x86_64.rpm ; \
+    rpm -ivh https://repositories.intel.com/graphics/rhel/8.5-devel/intel-level-zero-gpu-1.3.23453-i392.el8.x86_64.rpm ; \
+    rpm -ivh https://repositories.intel.com/graphics/rhel/8.5-devel/level-zero-1.8.1-i392.el8.x86_64.rpm ; \
+    dnf clean all

templates/ubuntu20/common/base.dockerfile.j2

@@ -146,7 +146,7 @@ RUN . "${INTEL_OPENVINO_DIR}"/setupvars.sh; \
     -D VIDEOIO_PLUGIN_LIST=ffmpeg,gstreamer,mfx \
     -D CMAKE_EXE_LINKER_FLAGS=-Wl,--allow-shlib-undefined \
     -D CMAKE_BUILD_TYPE=Release /opt/repo/opencv && \
-    ninja && cmake --install . && \
+    ninja -j $(nproc) && cmake --install . && \
     rm -Rf install/bin install/etc/samples
 
 WORKDIR /opt/repo/opencv/build/install

templates/ubuntu20/dist/dev.dockerfile.j2

@@ -24,8 +24,8 @@ RUN  echo "export OpenCV_DIR=${INTEL_OPENVINO_DIR}/extras/opencv/cmake" | tee -a
 # build samples into ${INTEL_OPENVINO_DIR}/samples/cpp/samples_bin
 WORKDIR ${INTEL_OPENVINO_DIR}/samples/cpp
 RUN ./build_samples.sh -b build && \
-    cp -R build/intel64/Release samples_bin && cp build/intel64/Release/libformat_reader.so . && \
-    rm -Rf build && mkdir -p build/intel64/Release/lib && mv libformat_reader.so build/intel64/Release/lib/ && rm -Rf samples_bin/lib/
+    cp -R build/intel64/Release samples_bin && \
+    rm -Rf build 
 
 # add Model API package
 # hadolint ignore=DL3013

templates/ubuntu20/hw/gpu.dockerfile.j2

@@ -1,6 +1,13 @@
 # for GPU
-ARG TEMP_DIR=/tmp/opencl
 
-WORKDIR ${INTEL_OPENVINO_DIR}/install_dependencies
-RUN ./install_NEO_OCL_driver.sh --no_numa -y && \
-    rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends gpg gpg-agent && \
+    curl https://repositories.intel.com/graphics/intel-graphics.key | gpg --dearmor --output /usr/share/keyrings/intel-graphics.gpg && \
+    echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/graphics/ubuntu focal-legacy main' | tee  /etc/apt/sources.list.d/intel.gpu.focal.list && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends \
+       intel-opencl-icd=22.35.24055+i815~u20.04 \
+       intel-level-zero-gpu=1.3.24055+i815~u20.04 \
+       level-zero=1.8.5+i815~u20.04 && \
+       apt-get purge gpg gpg-agent --yes && apt-get --yes autoremove && \
+       apt-get clean ; \
+       rm -rf /var/lib/apt/lists/* && rm -rf /tmp/* 

tests/conftest.py

@@ -307,12 +307,10 @@ def install_omz_commands(request, bash, image_os, distribution, install_openvino
                 if distribution == 'runtime':
                     install_dependencies = install_dependencies + ' && apt install -y libopencv-dev python3-opencv'
             elif 'rhel' in image_os:
-                install_dependencies = 'yum install -y git make'
+                install_dependencies = 'rm -f /etc/rhsm-host'
                 if distribution == 'runtime':
-                    install_dependencies = (install_dependencies + ' &&'
-                                            'yum install -y opencv '
-                                            'https://vault.centos.org/centos/8/PowerTools/x86_64/os/Packages/'
-                                            'opencv-devel-3.4.6-6.el8.x86_64.rpm'
+                    install_dependencies = (install_dependencies + ' && '
+                                            'yum install -y opencv git make'
                                             ' && pip3 install opencv-python')
 
             install_dev_wheel = install_openvino_dev_wheel('[caffe]') if distribution == 'runtime' else 'true'
@@ -336,9 +334,9 @@ def install_omz_commands(request, bash, image_os, distribution, install_openvino
 def install_openvino_dependencies(request):
     image_os = request.config.getoption('--image_os')
     if 'ubuntu' in image_os:
-        return '/bin/bash -ac "apt update && apt install -y build-essential curl cmake file"'
+        return '/bin/bash -ac "apt update && apt install -y build-essential curl cmake file libgl1"'
     elif 'rhel' in image_os:
-        return '/bin/bash -ac "yum install -y make file && pip3 install opencv-python"'
+        return 'bash -ac "rm -f /etc/rhsm-host && yum install -y make file mesa-libGL && pip3 install opencv-python"'
     return ''