Merge pull request #286 from yimm0815/smartstadium

remove pip, bug fix for algorithm selection in runva
OpenVisualCloud · Dec 17, 2019 · ddc9209 · ddc9209
2 parents ba6fbde + 8573990
commit ddc9209
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/analytics/common/runva.py b/analytics/common/runva.py
@@ -28,9 +28,7 @@ def stop(self):
         self._stop=True
 
     def loop(self, sensor, location, uri, algorithm, topic, algorithmName, resolution):
-        print("============================runva:loop===========================")
-        if algorithmName=="crowd_counting":
-            print("in crowd_counting: algorithmName=", algorithmName)
+        if algorithmName=="crowd-counting":
             pid,msg=PipelineManager.create_instance(self._pipeline,self._version,{
                 "source": {
                     "uri": uri,
@@ -66,7 +64,6 @@ def loop(self, sensor, location, uri, algorithm, topic, algorithmName, resolutio
                 },
             })
         else:
-            print("in others: algorithmName=", algorithmName)
             pid,msg=PipelineManager.create_instance(self._pipeline,self._version,{
                 "source": {
                     "uri": uri,

diff --git a/analytics/crowd-counting/Xeon/gst/Dockerfile b/analytics/crowd-counting/Xeon/gst/Dockerfile
@@ -1,8 +1,7 @@
 # smtc_analytics_crowd_counting_xeon_gst
 
 FROM smtc_analytics_common_xeon_gst
-RUN apt-get update -qq && apt-get install -qq python3-paho-mqtt python3-ply python3-requests python3-watchdog python3-pip && rm -rf /var/lib/apt/lists/*
-RUN pip3 install Pillow
+RUN apt-get update -qq && apt-get install -qq python3-paho-mqtt python3-ply python3-requests python3-watchdog python3-pillow && rm -rf /var/lib/apt/lists/*
 
 COPY --from=smtc_common /home/*.py /home/
 COPY *.py /home/