Merge pull request #413 from OpenVisualCloud/v20.4

V20.4 changes

Author: xwu2git

CMakeLists.txt

@@ -24,6 +24,40 @@ endif()
 if (NOT DEFINED NANALYTICS)
     set(NANALYTICS "1")
 endif()
+if (NOT DEFINED NETWORK)
+    if(PLATFORM STREQUAL "Xeon")
+        set(NETWORK "INT8,FP32")
+    endif()
+    if(PLATFORM STREQUAL "VCAC-A")
+        set(NETWORK "FP16")
+    endif()
+endif()
+
+if(PLATFORM STREQUAL "Xeon")
+    if((NOT (NETWORK MATCHES "FP32")) AND (NOT (NETWORK MATCHES "INT8")))
+        if(NOT (NETWORK MATCHES "FP32"))
+            set(NETWORK "FP32,${NETWORK}")
+        endif()
+        if(NOT (NETWORK MATCHES "INT8"))
+            set(NETWORK "INT8,${NETWORK}")
+        endif()
+    endif()
+    if(NETWORK MATCHES "FP16")
+        string(REGEX REPLACE "FP16,*" "" NETWORK ${NETWORK})
+    endif()
+endif()
+if(PLATFORM STREQUAL "VCAC-A")
+    if(NOT (NETWORK MATCHES "FP16"))
+        set(NETWORK "FP16,${NETWORK}")
+    endif()
+    if(NETWORK MATCHES "FP32")
+        string(REGEX REPLACE "FP32,*" "" NETWORK ${NETWORK})
+    endif()
+    if(NETWORK MATCHES "INT8")
+        string(REGEX REPLACE "INT8,*" "" NETWORK ${NETWORK})
+    endif()
+endif()
+string(REGEX REPLACE ",$" "" NETWORK ${NETWORK})
 
 file(GLOB dirs "deployment" "*")
 list(REMOVE_DUPLICATES dirs)
@@ -37,4 +71,4 @@ endforeach()
 execute_process(COMMAND printf "\n\nThis script will build third party components licensed under various open source licenses into your container images. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses.\n\n")
 
 
-execute_process(COMMAND printf "\n-- Setting: PLATFORM=${PLATFORM}, SCENARIO=${SCENARIO}, NOFFICES=${NOFFICES}, NCAMERAS=${NCAMERAS}, NANALYTICS=${NANALYTICS}, FRAMEWORK=${FRAMEWORK}\n")
+execute_process(COMMAND printf "\n-- Setting: PLATFORM=${PLATFORM}, SCENARIO=${SCENARIO}, NOFFICES=${NOFFICES}, NCAMERAS=${NCAMERAS}, NANALYTICS=${NANALYTICS}, FRAMEWORK=${FRAMEWORK}, NETWORK=${NETWORK}\n")

analytics/common/VCAC-A/gst/Dockerfile

@@ -1,9 +1,21 @@
 # smtc_analytics_common_vcac-a_gst
 
-FROM smtc_analytics_common_vcac-a_gst_base
+FROM openvisualcloud/vcaca-ubuntu1804-analytics-gst:20.4 as build
 
-# Fetch python3 and Install python3
-RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends libjson-c3 python3-gst-1.0 python3-jsonschema &&  rm -rf /var/lib/apt/lists/*;
-COPY VCAC-A/gst/frame.py /usr/lib/python3.6/gstgva/
-COPY app /home/
+RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && apt-get install -qq git ca-certificates
+ARG VA_SERVING_REPO=https://github.com/intel/video-analytics-serving.git
+ARG VA_SERVING_BRANCH="v0.3_preview"
+ARG VA_SERVING_TAG="1b342051b85682beadb1ec173f848697fa2f02b2"
+
+RUN git clone ${VA_SERVING_REPO} -b ${VA_SERVING_BRANCH} --depth 1
+RUN cd video-analytics-serving; git checkout ${VA_SERVING_TAG}
+RUN rm -rf /home/video-analytics-serving/vaserving/__main__.py
+RUN rm -rf /home/video-analytics-serving/vaserving/rest_api
+
+FROM openvisualcloud/vcaca-ubuntu1804-analytics-gst:20.4
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && apt-get install -qq python3-gst-1.0 python3-jsonschema python3-psutil && rm -rf /var/lib/apt/lists/*
+
+COPY --from=build /home/video-analytics-serving/vaserving /home/vaserving
+ENV  FRAMEWORK=gstreamer
 COPY *.py /home/