Update Jetson Dockerfiles

Author: koleini

app/Dockerfile.jetson

@@ -11,18 +11,15 @@ FROM redisfab/redisedgevision-${OSNICK}:0.2.0
 ENV LD_PRELOAD /usr/lib/aarch64-linux-gnu/libgomp.so.1
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get -qq update
-
-RUN set -ex ;\
-        apt-get install -y wget python3-distutils patch ;\
-        wget -q https://bootstrap.pypa.io/get-pip.py -O /tmp/get-pip.py ;\
-        python3 /tmp/get-pip.py
+RUN apt-get -qq update && apt-get install -qqy wget python3-distutils patch
+RUN wget -q https://bootstrap.pypa.io/get-pip.py -O /tmp/get-pip.py && python3 /tmp/get-pip.py
 
 WORKDIR /app
 ADD . /app
 
 # patch init script for aarch64
-RUN patch init.py jetson.patch
+RUN patch init.py init.patch
+RUN patch gear.py gear.patch
 
 RUN pip3 install -r requirements.txt
 

app/jetson.patch renamed to app/gear.patch

@@ -1,16 +1,14 @@
-diff --git a/app/gear.py b/app/gear.py
-index b602dfe..ab92667 100644
---- a/app/gear.py
-+++ b/app/gear.py
-@@ -27,6 +27,7 @@ def toOneList(l):
+--- gear.py	2021-03-29 17:15:04.726216533 -0500
++++ gear.py.updated	2021-03-29 17:14:34.195958815 -0500
+@@ -27,6 +27,7 @@
      return res
 
  def addToGraphRunner(x):
 +    x = x['value']
      try:
          xlog('addToGraphRunner:', 'count=', x['count'])
 
-@@ -54,7 +55,7 @@ def addToGraphRunner(x):
+@@ -54,7 +55,7 @@
          animal = index[str(res.index(res1[0]) - 1)][1]
          xlog('addToGraphRunner:', 'animal=', animal)
 
@@ -19,7 +17,7 @@ index b602dfe..ab92667 100644
      except:
          xlog('addToGraphRunner: error:', sys.exc_info()[0])
 
-@@ -62,21 +63,24 @@ def addToStream(x):
+@@ -62,21 +63,24 @@
      # save animal name into a new stream
      try:
          redisgears.executeCommand('xadd', 'cats', 'MAXLEN', '~', str(MAX_IMAGES), '*', 'image', 'data:image/jpeg;base64,' + base64.b64encode(x[1]).decode('utf8'))
@@ -46,23 +44,10 @@ index b602dfe..ab92667 100644
      except:
          xlog('passAll: error:', sys.exc_info()[0])
 
-@@ -87,4 +91,5 @@ gearsCtx('StreamReader').\
+@@ -87,4 +91,5 @@
      map(addToGraphRunner).\
      filter(lambda x: 'cat' in x[0]).\
      foreach(addToStream).\
 -    register('camera:0')
 +    register(prefix='camera:0')
 +
-diff --git a/app/init.py b/app/init.py
-index 09f77bc..64a1303 100644
---- a/app/init.py
-+++ b/app/init.py
-@@ -27,7 +27,7 @@ if __name__ == '__main__':
-     print('Loading model - ', end='')
-     with open('models/mobilenet_v2_1.4_224_frozen.pb', 'rb') as f:
-         model = f.read()
--        res = conn.execute_command('AI.MODELSET', 'mobilenet:model', 'TF', 'CPU', 'INPUTS', 'input', 'OUTPUTS', 'MobilenetV2/Predictions/Reshape_1', model)
-+        res = conn.execute_command('AI.MODELSET', 'mobilenet:model', 'TF', 'CPU', 'INPUTS', 'input', 'OUTPUTS', 'MobilenetV2/Predictions/Reshape_1', 'BLOB', model)
-         print(res)
- 
-     # Load the gear

app/init.patch

@@ -0,0 +1,11 @@
+--- init.py	2021-03-29 17:14:57.525688056 -0500
++++ init.py.updated	2021-03-29 17:14:27.563462225 -0500
+@@ -27,7 +27,7 @@
+     print('Loading model - ', end='')
+     with open('models/mobilenet_v2_1.4_224_frozen.pb', 'rb') as f:
+         model = f.read()
+-        res = conn.execute_command('AI.MODELSET', 'mobilenet:model', 'TF', 'CPU', 'INPUTS', 'input', 'OUTPUTS', 'MobilenetV2/Predictions/Reshape_1', model)
++        res = conn.execute_command('AI.MODELSET', 'mobilenet:model', 'TF', 'CPU', 'INPUTS', 'input', 'OUTPUTS', 'MobilenetV2/Predictions/Reshape_1', 'BLOB', model)
+         print(res)
+ 
+     # Load the gear

camera/Dockerfile.jetson

@@ -1,7 +1,7 @@
 FROM nvcr.io/nvidia/l4t-base:r32.5.0
 
 # This is due on the following error on ARMv8:
-# /usr/lib/aarch64-linux-gnu/libgomp.so.1: cannot allocate memory in static TLS block 
+# /usr/lib/aarch64-linux-gnu/libgomp.so.1: cannot allocate memory in static TLS block
 # Something is exausting TLS, causing libgomp to fail. Preloading it as a workaround helps.
 # ENV LD_PRELOAD /usr/lib/aarch64-linux-gnu/libgomp.so.1
 
@@ -10,11 +10,8 @@ ENV LD_LIBRARY_PATH=/usr/lib/aarch64-linux-gnu:$LD_LIBRARY_PATH
 ENV LD_PRELOAD /usr/lib/aarch64-linux-gnu/libgomp.so.1
 
 RUN apt-get -qq update && apt-get upgrade -y
-
-RUN set -x; \
-        apt-get install -y curl patch; \
-        curl https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py ;\
-        python3 /tmp/get-pip.py
+RUN apt-get install -qqy curl patch
+RUN curl https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py && python3 /tmp/get-pip.py
 
 RUN pip install redis==3.2.1
 

redis/Dockerfile.jetson

@@ -52,8 +52,8 @@ ARG BUILD_ARGS="GPU=1 SHOW=1 WITH_TFLITE=0 WITH_PT=0 WITH_ORT=0 WITH_UNIT_TESTS=
 
 #RUN apt-get install -y libegl1-mesa-dev freeglut3-dev
 
-RUN bash -c "set -e ;\
-    . ./opt/readies/bin/sourced ./profile.d ;\
+RUN bash -c "set -e &&\
+    . ./opt/readies/bin/sourced ./profile.d &&\
     make -C opt build $BUILD_ARGS"
 
 # build RedisGears
@@ -71,8 +71,7 @@ ARG GEARS_VER
 ENV NVIDIA_VISIBLE_DEVICES all
 ENV NVIDIA_DRIVER_CAPABILITIES compute,utility
 
-RUN if [ ! -z $(command -v apt-get) ]; then apt-get -qq update; apt-get -q install -y libgomp1 build-essential libatlas-base-dev cmake ; fi
-RUN if [ ! -z $(command -v yum) ]; then yum install -y libgomp; fi
+RUN apt-get -qq update && apt-get -q install -y libgomp1 build-essential libatlas-base-dev cmake
 
 ENV REDIS_MODULES /usr/lib/redis/modules
 RUN mkdir -p $REDIS_MODULES/