Merge pull request #1621 from openvinotoolkit/develop

Release OVMS 2022.3

JIRA:CVS-98971

.bazelrc

@@ -73,4 +73,5 @@ build --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=1
 
 build --experimental_repo_remote_exec
 build --force_pic
+build --experimental_cc_shared_library
 

.gitignore

@@ -21,3 +21,5 @@ __pycache__
 dist/
 lib/
 !client/python/ovmsclient/lib
+cppclean_src
+cppclean_test

Dockerfile.redhat

@@ -14,38 +14,39 @@
 # limitations under the License.
 #
 
-ARG BASE_IMAGE=registry.access.redhat.com/ubi8/ubi:8.6
+ARG BASE_IMAGE=registry.access.redhat.com/ubi8/ubi:8.7
 FROM $BASE_IMAGE as base_build
 
 LABEL version="1.0.0"
 
+SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
+
 ARG ov_source_branch=releases/2021/2
-ARG ovms_metadata_file
 
-ARG INSTALL_DIR=/opt/intel/openvino
-ARG TEMP_DIR=/tmp/openvino_installer
-ARG DL_INSTALL_DIR=/opt/intel/openvino/deployment_tools
-ARG DL_DIR=/tmp
 ARG JOBS
+
 # build_type=[ opt, dbg ]
 ARG build_type=dbg
 ARG debug_bazel_flags=--strip=never\ --copt="-g"\ -c\ dbg
 ARG minitrace_flags
 ENV TF_SYSTEM_LIBS="curl"
+ENV TEST_LOG="/root/.cache/bazel/_bazel_root/bc57d4817a53cab8c785464da57d1983/execroot/ovms/bazel-out/test.log"
 
-RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && yum update -d6 -y && yum install -d6 -y \
+RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && dnf clean all && yum update -d6 -y && yum install -d6 -y \
  boost169-atomic \
  boost169-chrono \
  boost169-filesystem \
  boost169-program-options \
  boost169-thread \
  boost169-system \
  boost169-date-time \
+ bc \
  cmake \
- gcc-c++ \
  curl \
+ gcc-c++ \
  gdb \
  git \
+ java-11-openjdk-devel \
  libgusb.x86_64 \
  libusbx \
  libcurl-devel \
@@ -66,22 +67,32 @@ RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.n
  which \
  yum-utils \
  unzip \
- xz && \
+ vim \
+ xz \
+ https://vault.centos.org/centos/8/AppStream/x86_64/os/Packages/tbb-2018.2-9.el8.x86_64.rpm && \
  yum clean all
 
+# Build and install pugixml
+# hadolint ignore=DL3003
+RUN git clone -b v1.13 https://github.com/zeux/pugixml && \
+ cd pugixml && \
+ cmake -DBUILD_SHARED_LIBS=ON && \
+ make all && \
+ cp libpugixml.so* /usr/lib64/
+
 # Set up Bazel
-ENV BAZEL_VERSION 3.7.2
+ENV BAZEL_VERSION 5.3.1
 WORKDIR /bazel
 RUN curl -H "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36" -fSsL -O https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
  curl -H "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36" -fSsL -o /bazel/LICENSE.txt https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE && \
  chmod +x bazel-*.sh && \
  ./bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
- cd / && \
  rm -f /bazel/bazel-$BAZEL_VERSION-installer-linux-x86_64.sh
 
 ####### Azure SDK needs new boost:
 WORKDIR /boost
-RUN wget https://sourceforge.net/projects/boost/files/boost/1.68.0/boost_1_68_0.tar.gz && \
+# hadolint ignore=DL3003
+RUN wget -nv https://sourceforge.net/projects/boost/files/boost/1.68.0/boost_1_68_0.tar.gz && \
  tar xvf boost_1_68_0.tar.gz && cd boost_1_68_0 && ./bootstrap.sh && \
  ./b2 cxxstd=17 link=static cxxflags='-fPIC' cflags='-fPIC' \
  --with-chrono --with-date_time --with-filesystem --with-program_options --with-system \
@@ -93,27 +104,23 @@ COPY third_party /ovms/third_party/
 
 ####### Azure SDK
 WORKDIR /azure
-RUN git clone https://github.com/Microsoft/cpprestsdk.git && cd cpprestsdk && git checkout tags/v2.10.16 -b v2.10.16 && git submodule update --init
+RUN git clone --recurse-submodules --depth 1 --branch v2.10.16 https://github.com/Microsoft/cpprestsdk.git && \
+ git clone --depth 1 --branch v7.5.0 https://github.com/Azure/azure-storage-cpp.git && \
+ patch -d /azure/cpprestsdk/ -p1 < /ovms/third_party/cpprest/rest_sdk_v2.10.16.patch && \
+ patch -d /azure/azure-storage-cpp/ -p1 </ovms/third_party/azure/azure_sdk.patch
 
-RUN git clone https://github.com/Azure/azure-storage-cpp.git && cd azure-storage-cpp/Microsoft.WindowsAzure.Storage && git checkout tags/v7.5.0 && mkdir build.release
+WORKDIR /azure/cpprestsdk/Release/build.release
+RUN cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_CXX_FLAGS="-fPIC" -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DBoost_USE_STATIC_RUNTIME=ON -DBoost_USE_STATIC_LIBS=ON -DWERROR=OFF -DBUILD_SAMPLES=OFF -DBUILD_TESTS=OFF && make --jobs=$JOBS install
 
-WORKDIR /
-RUN cp -rf /ovms/third_party/cpprest/rest_sdk_v2.10.16.patch /azure/cpprestsdk/
-RUN cd /azure/cpprestsdk/ && patch -p1 < rest_sdk_v2.10.16.patch
-RUN cp -rf /ovms/third_party/azure/azure_sdk.patch /azure/azure-storage-cpp/
-RUN cd /azure/azure-storage-cpp/ && patch -p1 < azure_sdk.patch
-WORKDIR /azure
-
-RUN cd cpprestsdk && mkdir Release/build.release && cd Release/build.release && cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_CXX_FLAGS="-fPIC" -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DBoost_USE_STATIC_RUNTIME=ON -DBoost_USE_STATIC_LIBS=ON -DWERROR=OFF -DBUILD_SAMPLES=OFF -DBUILD_TESTS=OFF && make --jobs=$JOBS install
-RUN cd azure-storage-cpp/Microsoft.WindowsAzure.Storage/build.release && CASABLANCA_DIR=/azure/cpprestsdk cmake .. -DCMAKE_CXX_FLAGS="-fPIC" -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DBoost_USE_STATIC_RUNTIME=ON -DBoost_USE_STATIC_LIBS=ON -DCMAKE_VERBOSE_MAKEFILE=ON && make --jobs=$JOBS && make --jobs=$JOBS install
+WORKDIR /azure/azure-storage-cpp/Microsoft.WindowsAzure.Storage/build.release
+RUN CASABLANCA_DIR=/azure/cpprestsdk cmake .. -DCMAKE_CXX_FLAGS="-fPIC" -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DBoost_USE_STATIC_RUNTIME=ON -DBoost_USE_STATIC_LIBS=ON -DCMAKE_VERBOSE_MAKEFILE=ON && make --jobs=$JOBS && make --jobs=$JOBS install
 
 ####### End of Azure SDK
 
 # Build AWS S3 SDK
 RUN git clone https://github.com/aws/aws-sdk-cpp.git --branch 1.7.129 --single-branch --depth 1 /awssdk
 WORKDIR /awssdk/build
-RUN cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_ONLY=s3 -DENABLE_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DMINIMIZE_SIZE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DFORCE_SHARED_CRT=OFF -DSIMPLE_INSTALL=OFF -DCMAKE_CXX_FLAGS=" -D_GLIBCXX_USE_CXX11_ABI=1 " ..
-RUN make --jobs=$JOBS
+RUN cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_ONLY=s3 -DENABLE_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DMINIMIZE_SIZE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DFORCE_SHARED_CRT=OFF -DSIMPLE_INSTALL=OFF -DCMAKE_CXX_FLAGS=" -D_GLIBCXX_USE_CXX11_ABI=1 " .. && make --jobs=$JOBS
 RUN mv .deps/install/lib64 .deps/install/lib
 
 ####### End of AWS S3 SDK
@@ -125,13 +132,13 @@ RUN ./install_opencv.sh
 
 ARG ov_use_binary=1
 ARG DLDT_PACKAGE_URL
-ARG OPENVINO_NAME=${DLDT_PACKAGE_URL}
+ARG TEMP_DIR=/tmp/openvino_installer
 
 ################### TAKE OPENVINO FROM A BINARY RELEASE - buildarg ov_use_binary=1 (DEFAULT) ##########
-WORKDIR /
+WORKDIR $TEMP_DIR
 # OV toolkit package
-RUN if [ "$ov_use_binary" == "1" ] && [ "$DLDT_PACKAGE_URL" != "" ]; then true ; else exit 0 ; fi ; mkdir -p $TEMP_DIR && cd $TEMP_DIR/ && \
- wget $DLDT_PACKAGE_URL && \
+RUN if [ "$ov_use_binary" = "1" ] && [ "$DLDT_PACKAGE_URL" != "" ]; then true ; else exit 0 ; fi ; \
+ wget -nv $DLDT_PACKAGE_URL && \
  mkdir /opt/intel && \
  tar -zxf l_openvino_toolkit*.tgz -C /opt/intel && \
  ln -s /opt/intel/l_openvino_toolkit* /opt/intel/openvino && \
@@ -145,42 +152,81 @@ COPY .bazelrc WORKSPACE /ovms/
 RUN ln -s /usr/lib64 /usr/lib/x86_64-linux-gnu
 COPY external /ovms/external/
 COPY third_party /ovms/third_party/
+COPY MakefileCapi /ovms/
 
 RUN alternatives --set python /usr/bin/python3
+
+# hadolint ignore=DL3059
 RUN bazel build --jobs=$JOBS ${debug_bazel_flags} @org_tensorflow//tensorflow/core:framework
+
+# Patch apple build scripts
+# hadolint ignore=SC2046
+RUN patch -d $(bazel info output_base)/external/build_bazel_rules_apple/ -p1 < /ovms/third_party/build_bazel_rules_apple/bazel_rules_apple.patch
+
 RUN bazel build --jobs=$JOBS ${debug_bazel_flags} @tensorflow_serving//tensorflow_serving/apis:prediction_service_cc_proto
 
+# hadolint ignore=DL3059
 RUN cp -v /etc/ssl/certs/ca-bundle.crt /etc/ssl/certs/ca-certificates.crt
 
 # Copy example clients into build image for static analysis
 WORKDIR /example_cpp_client
 COPY demos/common/cpp /example_cpp_client/cpp
 COPY demos/benchmark/cpp/synthetic_client_async_benchmark.cpp demos/image_classification/cpp/*.cpp /example_cpp_client/cpp/src/
 
-WORKDIR /ovms
-
 COPY src/ /ovms/src/
 
+# Sample CPU Extension
+WORKDIR /ovms/src/example/SampleCpuExtension/
+RUN make
+
+WORKDIR /ovms
+
 ARG PROJECT_VERSION="2022.2"
 ARG PROJECT_NAME="OpenVINO Model Server"
 LABEL description=${PROJECT_NAME}
 
 # Set OVMS version strings
 RUN bash -c "sed -i -e 's|REPLACE_PROJECT_NAME|${PROJECT_NAME}|g' /ovms/src/version.hpp"
-RUN bash -c "sed -i -e 's|REPLACE_PROJECT_VERSION|${PROJECT_VERSION}|g' /ovms/src/version.hpp"
-RUN if [ "$ov_use_binary" == "1" ] ; then true ; else exit 0 ; fi ; sed -i -e "s#REPLACE_OPENVINO_NAME#`find /opt/intel/ -maxdepth 1 -mindepth 1 -type d | grep openvino | grep -Eo '[0-9]{4}.[0-9].[0-9].[0-9]+.[^_]+'`#g" /ovms/src/version.hpp
+RUN if [ "$build_type" = "dbg" ] ; then bash -c "sed -i -e 's|REPLACE_PROJECT_VERSION|${PROJECT_VERSION}-debug|g' /ovms/src/version.hpp" ; else bash -c "sed -i -e 's|REPLACE_PROJECT_VERSION|${PROJECT_VERSION}|g' /ovms/src/version.hpp" ; fi ;
+RUN if [ "$ov_use_binary" = "1" ] ; then true ; else exit 0 ; fi ; sed -i -e "s#REPLACE_OPENVINO_NAME#$(find /opt/intel/ -maxdepth 1 -mindepth 1 -type d | grep openvino | grep -Eo '[0-9]{4}.[0-9].[0-9].[0-9]+.[^_]+')#g" /ovms/src/version.hpp
 
 ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/intel/openvino/runtime/lib/intel64/:/opt/opencv/lib/:/opt/intel/openvino/runtime/3rdparty/tbb/lib/
 
-RUN bazel build ${debug_bazel_flags} ${minitrace_flags} --jobs $JOBS //src:ovms
-RUN bazel build ${debug_bazel_flags} --jobs $JOBS //src:libsampleloader.so
+RUN wget -nv https://github.com/linux-test-project/lcov/releases/download/v1.16/lcov-1.16-1.noarch.rpm &&\
+ yum install -y lcov-1.16-1.noarch.rpm && yum clean all
+
+COPY check_coverage.bat /ovms/
+
+ARG CHECK_COVERAGE=0
+# Test Coverage
+RUN if [ "$CHECK_COVERAGE" = "1" ] ; then bazel coverage --combined_report=lcov --test_summary=detailed --test_output=streamed //src:ovms_test > ${TEST_LOG} 2>&1 || { cat ${TEST_LOG} && rm -rf ${TEST_LOG} && exit 1 ; } && genhtml --output genhtml "$(bazel info output_path)/_coverage/_coverage_report.dat" ; fi ; \
+ bazel test ${debug_bazel_flags} --jobs=$JOBS --test_summary=detailed --test_output=streamed //src:ovms_test > ${TEST_LOG} 2>&1 || (cat ${TEST_LOG} && rm -rf ${TEST_LOG} && exit 1 ; ) && tail -n 100 ${TEST_LOG} && rm -rf ${TEST_LOG}
 
-RUN cd /ovms/src/example/SampleCpuExtension/ && make
+# C api shared library
+RUN bazel build ${debug_bazel_flags} --jobs $JOBS //src:ovms_shared
 
-RUN bazel test ${debug_bazel_flags} --jobs $JOBS --test_summary=detailed --test_output=streamed //src:ovms_test
+# C api app with bazel
+# hadolint ignore=DL3059
+RUN bazel build ${debug_bazel_flags} --jobs $JOBS //src:capi_cpp_example
 
+# C-API benchmark app
+RUN bazel build //src:capi_benchmark && ./bazel-bin/src/capi_benchmark --niter 2 --threads_per_ireq 2 --nireq 1 --servable_name "dummy" --inputs_names "b" --shape "b[1,10]"
+
+# OVMS
+RUN bazel build ${debug_bazel_flags} ${minitrace_flags} --jobs=$JOBS //src:ovms
+
+# hadolint ignore=DL3059
+RUN bazel build ${debug_bazel_flags} --jobs=$JOBS //src:libsampleloader.so
+
+# C-api C/C++ app with gcc
+RUN make -f MakefileCapi cpp && make -f MakefileCapi c
+
+ARG ovms_metadata_file
 COPY ${ovms_metadata_file} metadata.json
 
-RUN ./bazel-bin/src/./ovms
+RUN /ovms/bazel-bin/src/ovms --version && /ovms/bazel-bin/src/ovms
+
 COPY release_files/thirdparty-licenses/ /ovms/release_files/thirdparty-licenses/
 COPY release_files/LICENSE /ovms/release_files/LICENSE
+COPY client /client
+COPY demos /demos