Merge branch 'master' into v1.2.3

Author: DvirDukhan

.circleci/config.yml

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve RedisAI
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. ...
+2. ....
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Environment (please complete the following information):**
+ - OS: [e.g. ubuntu 20.04]
+ - Version [e.g. 1.2.2]
+ - Platfrom [e.g. x86, Jetson, ARM]
+ - Runtime [e.g. CPU, CUDA]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for pushing RedisAI further
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,25 @@
+# https://github.com/marketplace/actions/run-circle-ci-on-label
+name: build-and-test-gpu
+
+on:
+  pull_request:
+    types:
+      - labeled
+      - synchronize
+      - assigned
+
+jobs:
+  valgrind_general:
+    if: github.event.label.name == 'ci-test'
+    runs-on: ubuntu-latest
+    name: Run build and test gpu
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: circle-ci job runner
+        id: curl-circle-ci
+        uses: Open-Source-Contrib/circle-ci-trigger-action@latest
+        with:
+          circle_ci_token: ${{ secrets.CIRCLE_CI_SECRET}}
+          circle_ci_job: build-and-test-gpu
+          circle_ci_project_url: ${{ github.event.pull_request.head.ref }}

.github/workflows/trigger-build-and-test-gpu.yaml

@@ -0,0 +1,25 @@
+# https://github.com/marketplace/actions/run-circle-ci-on-label
+name: valgrind-general-run
+
+on:
+  pull_request:
+    types:
+      - labeled
+      - synchronize
+      - assigned
+
+jobs:
+  valgrind_general:
+    if: github.event.label.name == 'ci-test'
+    runs-on: ubuntu-latest
+    name: Run valgrind general
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: circle-ci job runner
+        id: curl-circle-ci
+        uses: Open-Source-Contrib/circle-ci-trigger-action@latest
+        with:
+          circle_ci_token: ${{ secrets.CIRCLE_CI_SECRET}}
+          circle_ci_job: valgrind-general
+          circle_ci_project_url: ${{ github.event.pull_request.head.ref }}

.github/workflows/trigger-valgrind.yaml

@@ -55,7 +55,7 @@ option(BUILD_TF "Build the TensorFlow backend" ON)
 option(BUILD_TFLITE "Build the TensorFlow Lite backend" ON)
 option(BUILD_ORT "Build the ONNXRuntime backend" ON)
 option(BUILD_TORCH "Build the PyTorch backend" ON)
-
+option(BUILD_REDISAI_LITE "Build the RedisAI Lite Varient" OFF)
 #----------------------------------------------------------------------------------------------
 
 FUNCTION(ADD_LDFLAGS _TARGET NEW_FLAGS)
@@ -114,6 +114,9 @@ ENDIF()
 
 SET(CMAKE_C_STANDARD 11)
 ADD_DEFINITIONS(-DREDISMODULE_EXPERIMENTAL_API)
+if(BUILD_REDISAI_LITE)
+    ADD_DEFINITIONS(-DREDISAI_LITE)
+ENDIF()
 
 # SET(CUDA_TOOLKIT_ROOT_DIR /usr/local/cuda-10.0)
 

CMakeLists.txt

@@ -12,6 +12,7 @@ ARG OS=debian:buster-slim
 ARG ARCH=x64
 
 ARG PACK=0
+ARG REDISAI_LITE=0
 ARG TEST=0
 
 #----------------------------------------------------------------------------------------------
@@ -22,14 +23,17 @@ ARG OSNICK
 ARG OS
 ARG ARCH
 ARG REDIS_VER
+ARG REDISAI_LITE
+ARG PACK
+ARG TEST
 
 RUN echo "Building for ${OSNICK} (${OS}) for ${ARCH} [with Redis ${REDIS_VER}]"
 
 WORKDIR /build
 COPY --from=redis /usr/local/ /usr/local/
 
 COPY ./opt/ opt/
-COPY ./tests/flow/test_requirements.txt tests/flow/
+ADD ./tests/flow/ tests/flow/
 
 RUN FORCE=1 ./opt/readies/bin/getpy3
 RUN ./opt/system-setup.py
@@ -40,18 +44,16 @@ RUN if [ "$DEPS_ARGS" = "" ]; then ./get_deps.sh cpu; else env $DEPS_ARGS ./get_
 
 ARG BUILD_ARGS=""
 ADD ./ /build
-RUN bash -l -c "make -C opt build $BUILD_ARGS SHOW=1"
+RUN bash -l -c "make -C opt build REDISAI_LITE=${REDISAI_LITE} $BUILD_ARGS SHOW=1"
 
-ARG PACK
-ARG TEST
 
 RUN mkdir -p bin/artifacts
 RUN set -e ;\
-    if [ "$PACK" = "1" ]; then bash -l -c "make -C opt pack"; fi
+    if [ "$PACK" = "1" ]; then bash -l -c "make -C opt pack REDISAI_LITE=${REDISAI_LITE}"; fi
 
 RUN set -e ;\
     if [ "$TEST" = "1" ]; then \
-        bash -l -c "TEST= make -C opt test $BUILD_ARGS NO_LFS=1" ;\
+        bash -l -c "TEST= make -C opt test REDISAI_LITE=${REDISAI_LITE} $BUILD_ARGS NO_LFS=1" ;\
         if [[ -d test/logs ]]; then \
             tar -C test/logs -czf bin/artifacts/test-logs-cpu.tgz . ;\
         fi ;\
@@ -67,7 +69,7 @@ ARG REDIS_VER
 ARG PACK
 
 RUN if [ ! -z $(command -v apt-get) ]; then apt-get -qq update; apt-get -q install -y libgomp1; fi
-RUN if [ ! -z $(command -v yum) ]; then yum install -y libgomp; fi 
+RUN if [ ! -z $(command -v yum) ]; then yum install -y libgomp; fi
 
 ENV REDIS_MODULES /usr/lib/redis/modules
 ENV LD_LIBRARY_PATH $REDIS_MODULES

Dockerfile

@@ -12,6 +12,7 @@ ARG OS=debian:buster-slim
 ARG ARCH=arm64v8
 
 ARG PACK=0
+ARG REDISAI_LITE=0
 ARG TEST=0
 
 #----------------------------------------------------------------------------------------------
@@ -31,7 +32,7 @@ WORKDIR /build
 COPY --from=redis /usr/local/ /usr/local/
 
 COPY ./opt/ opt/
-COPY ./tests/flow/test_requirements.txt tests/flow
+COPY ./tests/flow/tests_setup/test_requirements.txt tests/flow
 
 RUN ./opt/readies/bin/getpy3
 RUN ./opt/system-setup.py
@@ -66,7 +67,7 @@ ARG REDIS_VER
 ARG PACK
 
 RUN if [ ! -z $(command -v apt-get) ]; then apt-get -qq update; apt-get -q install -y libgomp1; fi
-RUN if [ ! -z $(command -v yum) ]; then yum install -y libgomp; fi 
+RUN if [ ! -z $(command -v yum) ]; then yum install -y libgomp; fi
 
 ENV REDIS_MODULES /usr/lib/redis/modules
 ENV LD_LIBRARY_PATH $REDIS_MODULES

Dockerfile.arm

@@ -14,6 +14,7 @@ ARG ARCH=x64
 ARG CUDA_VER=11.0-cudnn8
 
 ARG PACK=0
+ARG REDISAI_LITE=0
 ARG TEST=0
 
 #----------------------------------------------------------------------------------------------
@@ -35,13 +36,10 @@ ENV NVIDIA_DRIVER_CAPABILITIES compute,utility
 WORKDIR /build
 COPY --from=redis /usr/local/ /usr/local/
 
-COPY --from=cuda_10.2 /usr/local/cuda-10.2 /usr/local/cuda-10.2
-COPY --from=cuda_10.2 /usr/lib/x86_64-linux-gnu/libcu* /usr/lib/x86_64-linux-gnu/
-
-RUN echo export LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda-11.0/lib64:/usr/local/cuda-10.2/lib64:$LD_LIBRARY_PATH > /etc/profile.d/cuda.sh
+RUN echo export LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda-11.0/lib64:$LD_LIBRARY_PATH > /etc/profile.d/cuda.sh
 
 COPY ./opt/ opt/
-COPY ./tests/flow/test_requirements.txt tests/flow/
+ADD ./tests/flow/ tests/flow/
 
 RUN FORCE=1 ./opt/readies/bin/getpy3
 RUN ./opt/system-setup.py
@@ -55,11 +53,12 @@ ADD ./ /build
 RUN bash -l -c "make -C opt build GPU=1 $BUILD_ARGS SHOW=1"
 
 ARG PACK
+ARG REDISAI_LITE
 ARG TEST
 
 RUN mkdir -p bin/artifacts
 RUN set -e ;\
-    if [ "$PACK" = "1" ]; then bash -l -c "make -C opt pack GPU=1"; fi
+    if [ "$PACK" = "1" ]; then bash -l -c "make -C opt pack GPU=1 REDISAI_LITE=$REDISAI_LITE"; fi
 
 RUN set -e ;\
     if [ "$TEST" = "1" ]; then \
@@ -75,13 +74,12 @@ FROM nvidia/cuda:${CUDA_VER}-runtime-${OS}
 ARG OS
 
 RUN if [ ! -z $(command -v apt-get) ]; then apt-get -qq update; apt-get -q install -y libgomp1; fi
-RUN if [ ! -z $(command -v yum) ]; then yum install -y libgomp; fi 
+RUN if [ ! -z $(command -v yum) ]; then yum install -y libgomp; fi
 
 ENV REDIS_MODULES /usr/lib/redis/modules
 RUN mkdir -p $REDIS_MODULES/
 
 COPY --from=redis /usr/local/ /usr/local/
-COPY --from=builder /usr/local/cuda-10.2 /usr/local/cuda-10.2
 COPY --from=builder /usr/lib/x86_64-linux-gnu/libcu* /usr/lib/x86_64-linux-gnu/
 COPY --from=builder /build/install-gpu/ $REDIS_MODULES/
 

Dockerfile.gpu

@@ -28,14 +28,11 @@ ENV NVIDIA_DRIVER_CAPABILITIES compute,utility
 WORKDIR /build
 COPY --from=redis /usr/local/ /usr/local/
 
-COPY --from=cuda_10.2 /usr/local/cuda-10.2 /usr/local/cuda-10.2
-COPY --from=cuda_10.2 /usr/lib/x86_64-linux-gnu/libcu* /usr/lib/x86_64-linux-gnu/
-
-RUN echo export LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda-11.0/lib64:/usr/local/cuda-10.2/lib64:$LD_LIBRARY_PATH > /etc/profile.d/cuda.sh
+RUN echo export LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda-11.0/lib64:$LD_LIBRARY_PATH > /etc/profile.d/cuda.sh
 
 COPY ./opt/ opt/
-COPY ./tests/flow/test_requirements.txt tests/flow/
-COPY ./tests/flow/Install_RedisGears.sh tests/flow/
+COPY ./tests/flow/tests_setup/test_requirements.txt tests/flow/tests_setup/
+COPY ./tests/flow/tests_setup/Install_RedisGears.sh tests/flow/tests_setup/
 
 RUN VENV=venv FORCE=1 ./opt/readies/bin/getpy3