ARM support (ARM32v7, ARM64v8) (#10)

- Tested on x64,
- Tested on arm64v8 (64-bit Ubuntu 18),
- Pending testing on RPi3/Raspbian (32-bit).

Author: rafie

app/Dockerfile

@@ -1,9 +1,20 @@
-FROM python:3.7.3
+# FROM python:3.7.3
+FROM debian:buster
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV RUNTIME_DEPS "python3 python3-setuptools ca-certificates curl python3-opencv"
+
+RUN set -ex ;\
+    apt-get -qq update ;\
+    apt-get -q install -y --no-install-recommends $RUNTIME_DEPS
+
+RUN set -ex ;\
+	curl -q -s https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py ;\
+	python3 /tmp/get-pip.py
 
 WORKDIR /app
 ADD . /app
 
-RUN set -ex; \
-    pip install -r requirements.txt;
+RUN pip3 install -r requirements.txt
 
 ENTRYPOINT [ "python3" ]

app/gear.py

@@ -4,6 +4,7 @@
 import cv2
 import base64
 import redisAI
+import numpy
 
 framesToDrop = 0
 
@@ -27,8 +28,11 @@ def addToGraphRunner(x):
     dataM = imageio.imread(data).astype(dtype='float32')
     newImg = (cv2.resize(dataM, (224, 224)) / 128) - 1
 
+    l = numpy.asarray(newImg, dtype=numpy.float32)
+    img_ba = bytearray(l.tobytes())
+
     # converting the matrix color to Tensor
-    v1 = redisAI.createTensorFromValues('FLOAT', [1, 224, 224, 3], toOneList(newImg.tolist()))
+    v1 = redisAI.createTensorFromBlob('FLOAT', [1, 224, 224, 3], img_ba)
 
     # creating the graph runner, 'g1' is the key in redis on which the graph is located
     graphRunner = redisAI.createModelRunner('mobilenet:model')
@@ -45,15 +49,15 @@ def addToGraphRunner(x):
 
 def addToStream(x):
     # save animal name into a new stream
-    redisgears.executeCommand('xadd', 'cats', 'MAXLEN', '~', '1000', '*', 'image', 'data:image/jpeg;base64,' + base64.b64encode(x[1]))
+    redisgears.executeCommand('xadd', 'cats', 'MAXLEN', '~', '1000', '*', 'image', 'data:image/jpeg;base64,' + base64.b64encode(x[1]).decode('utf8'))
 
 def shouldTakeFrame(x):
     global framesToDrop
     framesToDrop += 1
     return framesToDrop % 10 == 0
 
 def passAll(x):
-    redisgears.executeCommand('xadd', 'all', 'MAXLEN', '~', '1000', '*', 'image', 'data:image/jpeg;base64,' + base64.b64encode(x['img']))
+    redisgears.executeCommand('xadd', 'all', 'MAXLEN', '~', '1000', '*', 'image', 'data:image/jpeg;base64,' + base64.b64encode(x['img']).decode('utf8'))
 
 # creating execution plane
 gearsCtx('StreamReader').\

app/requirements.txt

@@ -1,2 +1,2 @@
-opencv-python==4.0.1.23
+# opencv-python
 redis==3.2.1

camera/Dockerfile

@@ -0,0 +1,11 @@
+FROM python:2
+
+RUN set -ex;\
+    apt-get -qq update;\
+    apt-get install -y python-opencv
+
+WORKDIR /usr/src/app
+ADD read_camera.py ./
+RUN pip install redis
+
+CMD [ "python", "./read_camera.py" ]

camera/Dockerfile.debian

@@ -1,11 +1,11 @@
 version: '3'
 services:
   redis:
-    build: ./redis/.
+    build: ./redis
     ports:
       - "6379:6379"
   weball:
-    build: ./frontend/.
+    build: ./frontend
     ports:
       - "3000:3000"
     environment:
@@ -14,7 +14,7 @@ services:
     depends_on:
       - redis
   webcats:
-    build: ./frontend/.
+    build: ./frontend
     ports:
       - "3001:3000"
     environment:
@@ -23,7 +23,7 @@ services:
     depends_on:
       - redis
   app:
-    build: ./app/.
+    build: ./app
     depends_on:
       - redis
     command: ['init.py', '--url', 'redis://redis:6379']

docker-compose.yaml

@@ -1,22 +1,22 @@
-FROM redisai/redisai:0.2.0 as redisai
-FROM redislabs/redisgears:0.2.1 as redisgears
 
-ENV LD_LIBRARY_PATH /usr/lib/redis/modules/
-ENV RUNTIME_DEPS "python python-setuptools python-pip python-dev build-essential libglib2.0-0 libsm6 libxext6 libfontconfig1 libxrender1"
-ENV PYTHON_DEPS "setuptools redis argparse imageio opencv-python pybase64 redisAI==0.3.0"
+# OSNICK=stretch|bionic|buster
+ARG OSNICK=buster
 
-WORKDIR /data
+#----------------------------------------------------------------------------------------------
+FROM redisfab/redisedgevision-${OSNICK}:0.1.0
 
-RUN set -ex;\
-    apt-get update;\
-    apt-get install -y --no-install-recommends $RUNTIME_DEPS;
+# This is due on the following error on ARMv8:
+# /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
 
-COPY --from=redisai /usr/lib/redis/modules/*.so* "$LD_LIBRARY_PATH"
+ENV LD_LIBRARY_PATH /usr/lib/redis/modules/
 
-RUN pip install -t /usr/local/lib/python2.7/site-packages ${PYTHON_DEPS}
+WORKDIR /data
 
 EXPOSE 6379
 ENTRYPOINT ["redis-server"]
+
 CMD ["--loadmodule", "/usr/lib/redis/modules/redisai.so", \
-    "--loadmodule", "/usr/lib/redis/modules/redisgears.so", \
-    "PythonHomeDir", "/usr/lib/redis/modules/deps/cpython/"]
+	 "--loadmodule", "/usr/lib/redis/modules/redisgears.so", \
+	 "PythonHomeDir", "/opt/redislabs/lib/modules/python3/"]