1.2.7 cherry picks (#926)

Author: alonre24

.circleci/config.yml

@@ -140,11 +140,18 @@ commands:
       - run:
           name: Build
           command: make -C opt all SHOW=1
+      - restore_cache:
+          keys:
+            - v1.2-tests_data
       - run:
           name: Test
           command: |
             make -C opt test SHOW=1
           no_output_timeout: 20m
+      - save_cache:
+          paths:
+            - tests/flow/test_data
+          key: v1.2-tests_data
       - run:
           name: Package
           command: |
@@ -182,6 +189,9 @@ commands:
           name: Build for valgrind
           command: |
             make -C opt all VALGRIND=1 SHOW=1
+      - restore_cache:
+          keys:
+            - v1.2-tests_data
       - run:
           name: Test with valgrind
           command: |
@@ -198,6 +208,9 @@ commands:
       - restore_cache:
           keys:
           - v1.2.5-deps-{{ checksum "get_deps.sh" }}-gpu
+      - restore_cache:
+          keys:
+            - v1.2-tests_data-gpu
       - relocate-docker-storage
       - run:
           name: Build
@@ -215,6 +228,10 @@ commands:
             mkdir -p $HOME/tests
             docker run --gpus all -v $HOME/tests:/build/tests/flow/logs -it --rm redisai-gpu:latest-test
           no_output_timeout: 40m
+      - save_cache:
+          paths:
+            - tests/flow/test_data
+          key: v1.2-tests_data-gpu
       - store_artifacts:
           path: /home/circleci/tests
 
@@ -331,6 +348,9 @@ jobs:
           name: Build for coverage
           command: |
             make -C opt all COV=1 SHOW=1
+      - restore_cache:
+          keys:
+            - v1.2-tests_data
       - run:
           name: Test with coverage
           command: |

.gitignore

@@ -137,4 +137,7 @@ dkms.conf
 .idea_modules/
 
 # docs site
-site/
+site/
+
+# test data
+tests/flow/test_data

CMakeLists.txt

@@ -22,9 +22,9 @@ ENDIF()
 
 #----------------------------------------------------------------------------------------------
 
-SET(CMAKE_CC_COMMON_FLAGS "-fPIC -fcommon")
+SET(CMAKE_CC_COMMON_FLAGS "-fPIC -fcommon -g -ggdb")
 IF (USE_PROFILE)
-    SET(CMAKE_CC_COMMON_FLAGS "${CMAKE_CC_COMMON_FLAGS} -g -ggdb -fno-omit-frame-pointer")
+    SET(CMAKE_CC_COMMON_FLAGS "${CMAKE_CC_COMMON_FLAGS} -fno-omit-frame-pointer")
 ENDIF()
 
 IF (USE_COVERAGE)
@@ -42,7 +42,7 @@ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3")
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
 
 # Add -fno-omit-frame-pointer to avoid seeing incomplete stack traces
-set(CMAKE_COMMON_FLAGS_DEBUG "-g -ggdb -fno-omit-frame-pointer -D_DEBUG -DVALGRIND -include \
+set(CMAKE_COMMON_FLAGS_DEBUG "-fno-omit-frame-pointer -D_DEBUG -DVALGRIND -include \
     ${CMAKE_CURRENT_SOURCE_DIR}/src/config/gdb_config.h -I${CMAKE_CURRENT_SOURCE_DIR}/opt")
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${CMAKE_COMMON_FLAGS_DEBUG}")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${CMAKE_COMMON_FLAGS_DEBUG}")
@@ -168,18 +168,6 @@ IF(BUILD_ORT)
     ENDIF()
 ENDIF()
 
-#----------------------------------------------------------------------------------------------
-
-IF (APPLE)
-    FIND_LIBRARY(MKL_LIBRARIES NAMES mklml
-            PATHS ${depsAbs}/mkl/lib)
-    IF (NOT MKL_LIBRARIES)
-        MESSAGE(FATAL_ERROR "Could not find MKL for Mac")
-    ENDIF()
-    SET(platDeps "${MKL_LIBRARIES}")
-ENDIF()
-
-#----------------------------------------------------------------------------------------------
 
 IF(BUILD_TFLITE)
     # Find TensorFlow Lite stuff and build our wrapper
@@ -307,14 +295,6 @@ IF(BUILD_ORT)
             FILES_MATCHING PATTERN ${LIB_PATTERN})
 ENDIF()
 
-#----------------------------------------------------------------------------------------------
-
-IF (APPLE)
-    INSTALL(DIRECTORY ${depsAbs}/mkl/lib DESTINATION ${installAbs}/backends/redisai_torch
-            FILES_MATCHING PATTERN ${LIB_PATTERN})
-ENDIF()
-
-#----------------------------------------------------------------------------------------------
 
 IF (NOT ${installAbs} STREQUAL ${CMAKE_SOURCE_DIR}/install-${DEVICE})
     INSTALL_SYMLINK(${installAbs} ${CMAKE_SOURCE_DIR}/install-${DEVICE})

commands.json

@@ -67,7 +67,7 @@
         "since": "1.2.5",
         "group": "tensor"
     },
-    "AI.MODELSETORE":
+    "AI.MODELSTORE":
     {
         "summary": "stores a model as the value of a key",
         "complexity": "O(1)",

docs/commands.md

@@ -522,7 +522,7 @@ def addtwo(tensors: List[Tensor], keys: List[str], args: List[str]):
 It can be stored as a RedisAI script using the CPU device with [`redis-cli`](https://redis.io/topics/rediscli) as follows:
 
 ```
-$ cat addtwo.py | redis-cli -x AI.SCRIPTSET myscript CPU TAG myscript:v0.1 ENTRY_POINTS 1 addtwo SOURCE
+$ cat addtwo.py | redis-cli -x AI.SCRIPTSTORE myscript CPU TAG myscript:v0.1 ENTRY_POINTS 1 addtwo SOURCE
 OK
 ```
 
@@ -1144,7 +1144,7 @@ The **AI.CONFIG** command sets the value of configuration directives at run-time
 
 **Redis API**
 ```
-AI.CONFIG <BACKENDSPATH <path>> | <LOADBACKEND <backend> <path>> | <MODEL_CHUNK_SIZE <chunk_size>>
+AI.CONFIG <BACKENDSPATH <path>> | <LOADBACKEND <backend> <path>> | <MODEL_CHUNK_SIZE <chunk_size>> | <GET <BACKENDSPATH | MODEL_CHUNK_SIZE>> 
 ```
 
 _Arguments_
@@ -1156,6 +1156,7 @@ _Arguments_
     * **TORCH**: The PyTorch backend
     * **ONNX**: ONNXRuntime backend
 * **MODEL_CHUNK_SIZE**: Sets the size of chunks (in bytes) in which model payloads are split for serialization, replication and `MODELGET`. Default is `511 * 1024 * 1024`.
+* **GET**: Retrieve the current value of the `BACKENDSPATH / MODEL_CHUNK_SIZE` configurations. Note that additional information about the module's runtime configuration can be retrieved as part of Redis' info report via `INFO MODULES` command.  
 
 _Return_
 
@@ -1190,3 +1191,10 @@ This sets model chunk size to one megabyte (not recommended):
 redis> AI.CONFIG MODEL_CHUNK_SIZE 1048576
 OK
 ```
+
+This returns the current model chunk size configuration:
+
+```
+redis> AI.CONFIG GET MODEL_CHUNK_SIZE
+1048576
+```

docs/requirements.txt

@@ -1,4 +1,4 @@
-mkdocs==1.2.3
+mkdocs==1.2.4
 mkdocs-material==6.2.2
 -e git+https://github.com/RedisLabs/mkdocs-versions-menu.git#egg=mkdocs-versions-menu
 -e git+https://github.com/RedisLabs/mkdocs-include.git#egg=mkdocs-include

get_deps.sh

@@ -2,11 +2,11 @@
 
 ###### SET VERSIONS ######
 
-ORT_VERSION="1.9.0"
+ORT_VERSION="1.11.1"
 DLPACK_VERSION="v0.5_RAI"
-TF_VERSION="2.6.0"
+TF_VERSION="2.8.0"
 TFLITE_VERSION="2.0.0"
-PT_VERSION="1.10.1"
+PT_VERSION="1.11.0"
 
 ###### END VERSIONS ######
 
@@ -144,8 +144,16 @@ if [[ $OS == linux ]]; then
     else
         echo "Only x64 is supported currently"
     fi
-else
-    echo "Only Linux OS is supported currently"
+elif [[ $OS == macos ]]; then
+    TF_OS=darwin
+    TF_BUILD=cpu
+    TF_ARCH=x86_64
+    if [[ $WITH_TF == S3 ]]; then
+        LIBTF_URL_BASE=https://s3.amazonaws.com/redismodules/tensorflow
+    else
+        LIBTF_URL_BASE=https://storage.googleapis.com/tensorflow/libtensorflow
+    fi
+
 fi
 
 LIBTF_ARCHIVE=libtensorflow-${TF_BUILD}-${TF_OS}-${TF_ARCH}-${TF_VERSION}.tar.gz
@@ -163,11 +171,11 @@ if [[ $OS == linux ]]; then
     TFLITE_OS="linux"
     if [[ $ARCH == x64 ]]; then
         TFLITE_ARCH=x86_64
-    else
-        echo "Only x64 is supported currently"
     fi
-else
-    echo "Only Linux OS is supported currently"
+elif [[ $OS == macos ]]; then
+        TFLITE_OS=darwin
+        # TFLITE_BUILD=cpu
+        TFLITE_ARCH=x86_64
 fi
 
 LIBTFLITE_ARCHIVE=libtensorflowlite-${TFLITE_OS}-${TFLITE_ARCH}-${TFLITE_VERSION}.tar.gz
@@ -191,15 +199,17 @@ if [[ $OS == linux ]]; then
     else
         echo "Only x64 is supported currently"
     fi
-else
-    echo "Only Linux OS is supported currently"
+    LIBTORCH_ARCHIVE=libtorch-cxx11-abi-shared-with-deps-${PT_VERSION}%2B${PT_BUILD}.zip
+
+elif [[ $OS == macos ]]; then
+    PT_OS=macos
+    PT_ARCH=x86_64
+    PT_BUILD=cpu
+    PT_REPACK=1
+    LIBTORCH_ARCHIVE=libtorch-macos-${PT_VERSION}.zip
 fi
 
-if [[ $GPU != 1 ]]; then
-  LIBTORCH_ARCHIVE=libtorch-cxx11-abi-shared-with-deps-${PT_VERSION}%2B${PT_BUILD}.zip
-else
-  LIBTORCH_ARCHIVE=libtorch-cxx11-abi-shared-with-deps-${PT_VERSION}%2B${PT_BUILD}.zip
-fi
+
 LIBTORCH_URL=https://download.pytorch.org/libtorch/$PT_BUILD/$LIBTORCH_ARCHIVE
 
 if [[ $WITH_PT != 0 ]]; then
@@ -222,8 +232,11 @@ if [[ $OS == linux ]]; then
     else
         echo "Only x64 is supported currently"
     fi
-else
-    echo "Only Linux OS is supported currently"
+elif [[ $OS == macos ]]; then
+    ORT_OS=osx
+    ORT_ARCH=x64
+    ORT_BUILD=""
+    ORT_URL_BASE=https://github.com/microsoft/onnxruntime/releases/download/v${ORT_VERSION}
 fi
 
 ORT_ARCHIVE=onnxruntime-${ORT_OS}-${ORT_ARCH}${ORT_BUILD}-${ORT_VERSION}.tgz

opt/build/docker/dockerfile.tmpl

@@ -24,13 +24,19 @@ RUN echo "Building for {{REDIS_OSNICK}} ({{REDIS_OS}}) for {{REDIS_ARCH}} [with
 {% include "templates/gpu.yml" %}
 {% endif %}
 
+# centos8 specific integration until a move to rocky or similar
+{% if REDIS_OSNICK == "centos8" %}
+RUN cd /etc/yum.repos.d/
+RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
+RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
+{% endif %}
+
 WORKDIR /build
 COPY --from=redis /usr/local/ /usr/local/
 
 COPY ./opt/ opt/
 ADD ./tests/flow/ tests/flow/
 
-RUN ./opt/readies/bin/getupdates
 RUN if [ ! -z $(command -v apt-get) ]; then apt-get -qq update; apt-get -q install -y git; fi
 RUN if [ ! -z $(command -v yum) ]; then yum install -y git; fi
 RUN FORCE=1 ./opt/readies/bin/getpy3
@@ -69,6 +75,12 @@ FROM redisfab/redis:{{REDIS_VERSION}}-{{REDIS_ARCH}}-{{REDIS_OSNICK}}
 {% endif %}
 
 ARG PACK
+# centos8 specific integration until a move to rocky or similar
+{% if REDIS_OSNICK == "centos8" %}
+RUN cd /etc/yum.repos.d/
+RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
+RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
+{% endif %}
 
 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

opt/build/onnxruntime/Makefile

@@ -1,16 +1,16 @@
-REDIS_ONNX_VERSION?=1.9.0
+REDIS_ONNX_VERSION?=1.11.1
 REDIS_ONNX_REPO?=https://github.com/microsoft/onnxruntime
 
 PRODUCT=onnxruntime
 VERSION=${REDIS_ONNX_VERSION}
-REDIS_CUDA_VERSION=11.0-cudnn8
+REDIS_CUDA_VERSION=11.3.1-cudnn8
 
 # anything prefixed with REDIS, and exported is available in the docker build
 export REDIS_ONNX_VERSION
 export REDIS_ONNX_REPO
 export REDIS_CUDA_VERSION
 
-OSNICK=xenial
+OSNICK=bionic
 
 ROOT=.
 READIES=${ROOT}/../../readies

opt/build/onnxruntime/dockerfile.tmpl

@@ -1,6 +1,4 @@
-{% if REDIS_OSNICK == "xenial" %}
-{% set cuda_suffix_os = "ubuntu16.04" %}
-{% elif REDIS_OSNICK == "bionic" %}
+{% if REDIS_OSNICK == "bionic" %}
 {% set cuda_suffix_os = "ubuntu18.04" %}
 {% endif %}
 
@@ -12,9 +10,7 @@ FROM nvcr.io/nvidia/deepstream-l4t:5.1-21.02-base
 {% if REDIS_GPU is defined %}
 FROM nvidia/cuda:{{REDIS_CUDA_VERSION}}-devel-{{cuda_suffix_os}}
 {% else %}
-{% if REDIS_OSNICK == "xenial" %}
-FROM ubuntu:xenial
-{% elif REDIS_OSNICK == "bionic" %}
+{% if REDIS_OSNICK == "bionic" %}
 FROM ubuntu:bionic
 {% endif %}
 {% endif %}

opt/redis_valgrind.sup

@@ -184,4 +184,11 @@
    ...
    fun:_dl_catch_exception
    ...
-}
+}
+
+{
+   <ignore_torch_cond_jump>
+   Memcheck:Cond
+   ...
+   obj:*/libtorch_cpu.so*
+}

opt/system-setup.py

@@ -34,7 +34,10 @@ def debian_compat(self):
 
     def redhat_compat(self):
         self.run("%s/bin/enable-utf8" % READIES)
-        self.run("%s/bin/getepel" % READIES)
+        self.install("epel-release")
+        if self.osnick == "centos8":
+            self.run("dnf install -qy dnf-plugins-core")
+            self.run("dnf config-manager -qy --set-enabled powertools")
         self.install("redhat-lsb-core")
 
         self.run("%s/bin/getgcc --modern" % READIES)
@@ -71,9 +74,7 @@ def common_last(self):
         else:
             self.run("%s/bin/getcmake" % READIES)
 
-        self.run("{PYTHON} {READIES}/bin/getrmpytools".format(PYTHON=self.python, READIES=READIES))
-
-        self.pip_install("-r %s/tests/flow/tests_setup/test_requirements.txt" % ROOT)
+        self.pip_install("--ignore-installed PyYAML -r %s/tests/flow/tests_setup/test_requirements.txt" % ROOT)
 
         self.pip_install("awscli")
         self.pip_install("mkdocs mkdocs-material mkdocs-extensions")

ramp.yml

@@ -18,6 +18,7 @@ capabilities:
     - clustering
     - backup_restore
     - intershard_tls
+    - intershard_tls_pass
 exclude_commands:
     - ai.modelstore
     - ai.modelset