Merge pull request #760 from RedisAI/v1.2.3

v1.2.3 - RC3

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,11 +14,11 @@ ARG ARCH=x64
 ARG CUDA_VER=11.0-cudnn8
 
 ARG PACK=0
+ARG REDISAI_LITE=0
 ARG TEST=0
 
 #----------------------------------------------------------------------------------------------
 FROM redisfab/redis:${REDIS_VER}-${ARCH}-${OSNICK} AS redis
-FROM nvidia/cuda:10.2-cudnn8-devel-${OS} AS cuda_10.2
 FROM nvidia/cuda:${CUDA_VER}-devel-${OS} AS builder
 
 ARG OSNICK
@@ -35,13 +35,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 +52,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 +73,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

@@ -17,7 +17,6 @@ ARG PACK=1
 
 #----------------------------------------------------------------------------------------------
 FROM redisfab/redis:${REDIS_VER}-${ARCH}-${OSNICK} AS redis
-FROM nvidia/cuda:10.2-cudnn8-devel-${OS} AS cuda_10.2
 FROM nvidia/cuda:${CUDA_VER}-devel-${OS} AS builder
 
 SHELL ["/bin/bash", "-c"]
@@ -28,14 +27,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
 

Dockerfile.gpu-test

@@ -16,6 +16,7 @@ ARG CUDA_VER=10.2-cudnn7
 ARG L4T_VER=r32.4.4
 
 ARG PACK=0
+ARG REDISAI_LITE=0
 ARG TEST=0
 
 #----------------------------------------------------------------------------------------------
@@ -38,7 +39,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 FORCE=1 ./opt/readies/bin/getpy3
 RUN ./opt/system-setup.py
@@ -57,6 +58,7 @@ RUN bash -c "set -e ;\
     make -C opt build  $BUILD_ARGS SHOW=1"
 
 ARG PACK
+ARG REDISAI_LITE
 ARG TEST
 
 RUN mkdir -p bin/artifacts

Dockerfile.jetson

@@ -1,6 +1,6 @@
 [![GitHub issues](https://img.shields.io/github/release/RedisAI/RedisAI.svg?sort=semver)](https://github.com/RedisAI/RedisAI/releases/latest)
 [![CircleCI](https://circleci.com/gh/RedisAI/RedisAI/tree/master.svg?style=svg)](https://circleci.com/gh/RedisAI/RedisAI/tree/master)
-[![Dockerhub](https://img.shields.io/badge/dockerhub-redislabs%2Fredisai-blue)](https://hub.docker.com/r/redislabs/redisai/tags/) 
+[![Dockerhub](https://img.shields.io/badge/dockerhub-redislabs%2Fredisai-blue)](https://hub.docker.com/r/redislabs/redisai/tags/)
 [![codecov](https://codecov.io/gh/RedisAI/RedisAI/branch/master/graph/badge.svg)](https://codecov.io/gh/RedisAI/RedisAI)
 [![Total alerts](https://img.shields.io/lgtm/alerts/g/RedisAI/RedisAI.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/RedisAI/RedisAI/alerts/)
 
@@ -23,13 +23,13 @@ If you want to run examples, make sure you have [git-lfs](https://git-lfs.github
 To quickly tryout RedisAI, launch an instance using docker:
 
 ```sh
-docker run -p 6379:6379 -it --rm redislabs/redisai
+docker run -p 6379:6379 -it --rm redislabs/redisai:edge-cpu
 ```
 
 For docker instance with GPU support, you can launch it from `tensorwerk/redisai-gpu`
 
 ```sh
-docker run -p 6379:6379 --gpus all -it --rm redislabs/redisai:latest-gpu
+docker run -p 6379:6379 --gpus all -it --rm redislabs/redisai:edge-gpu
 ```
 
 But if you'd like to build the docker image, you need a machine that has Nvidia driver (CUDA 10.0), nvidia-container-toolkit and Docker 19.03+ installed. For detailed information, checkout [nvidia-docker documentation](https://github.com/NVIDIA/nvidia-docker)
@@ -46,7 +46,7 @@ Note that Redis config is located at `/usr/local/etc/redis/redis.conf` which can
 
 On the client, set the model
 ```sh
-redis-cli -x AI.MODELSET foo TF CPU INPUTS a b OUTPUTS c BLOB < tests/test_data/graph.pb
+redis-cli -x AI.MODELSTORE foo TF CPU INPUTS 2 a b OUTPUTS 1 c BLOB < tests/test_data/graph.pb
 ```
 
 Then create the input tensors, run the computation graph and get the output tensor (see `load_model.sh`). Note the signatures:
@@ -69,7 +69,7 @@ redis-cli
 
 ## Building
 
-You should obtain the module's source code and submodule using git like so: 
+You should obtain the module's source code and submodule using git like so:
 
 ```sh
 git clone --recursive https://github.com/RedisAI/RedisAI
@@ -116,12 +116,22 @@ redis-server --loadmodule install-cpu/redisai.so
 
 Some languages have client libraries that provide support for RedisAI's commands:
 
-| Project | Language | License | Author | URL |
-| ------- | -------- | ------- | ------ | --- |
-| JRedisAI | Java | BSD-3 | [RedisLabs](https://redislabs.com/) | [Github](https://github.com/RedisAI/JRedisAI) |
-| redisai-py | Python | BSD-3 | [RedisLabs](https://redislabs.com/) | [Github](https://github.com/RedisAI/redisai-py) |
-| redisai-go | Go | BSD-3 | [RedisLabs](https://redislabs.com/) | [Github](https://github.com/RedisAI/redisai-go) |
-| redisai-js | Typescript/Javascript | BSD-3 | [RedisLabs](https://redislabs.com/) | [Github](https://github.com/RedisAI/redisai-js) |
+| Project            | Language              | License      | Author                                           | URL                                                         |
+| -------            | --------              | -------      | ------                                           | ---                                                         |
+| JRedisAI           | Java                  | BSD-3        | [RedisLabs](https://redislabs.com/)              | [Github](https://github.com/RedisAI/JRedisAI)               |
+| redisai-py         | Python                | BSD-3        | [RedisLabs](https://redislabs.com/)              | [Github](https://github.com/RedisAI/redisai-py)             |
+| redisai-go         | Go                    | BSD-3        | [RedisLabs](https://redislabs.com/)              | [Github](https://github.com/RedisAI/redisai-go)             |
+| redisai-js         | Typescript/Javascript | BSD-3        | [RedisLabs](https://redislabs.com/)              | [Github](https://github.com/RedisAI/redisai-js)             |
+| redis-modules-sdk  | TypeScript            | BSD-3-Clause | [Dani Tseitlin](https://github.com/danitseitlin) | [Github](https://github.com/danitseitlin/redis-modules-sdk) |
+| redis-modules-java | Java                  | Apache-2.0   | [dengliming](https://github.com/dengliming)      | [Github](https://github.com/dengliming/redis-modules-java)  |
+| smartredis         | C++                   | BSD-2-Clause | [Cray Labs](https://github.com/CrayLabs)         | [Github](https://github.com/CrayLabs/SmartRedis)            |
+| smartredis         | C                     | BSD-2-Clause | [Cray Labs](https://github.com/CrayLabs)         | [Github](https://github.com/CrayLabs/SmartRedis)            |
+| smartredis         | Fortran               | BSD-2-Clause | [Cray Labs](https://github.com/CrayLabs)         | [Github](https://github.com/CrayLabs/SmartRedis)            |
+| smartredis         | Python                | BSD-2-Clause | [Cray Labs](https://github.com/CrayLabs)         | [Github](https://github.com/CrayLabs/SmartRedis)            |
+
+
+
+
 
 ## Backend Dependancy