V1.2.6 (#895)

* Merge pull request #892 from RedisAI/tflite_avoid_magic_numbers

avoid magic numbers in tflite

* Merge pull request #891 from RedisAI/validate_runqueue_upon_restart

create runqueue upon model and script loading

* Merge pull request #888 from RedisAI/pytorch_1_10

updated pytorch and cuda version

* Removed Xenial (#893)

* Merge pull request #894 from RedisAI/set_cluster_timeout_on_env_reset

added 120 seconds timeout for env restart and reload

* Fix device name validation in "modelstore" command (#884)

* 1.2.6 version bump

Co-authored-by: Chayim <[email protected]>
Co-authored-by: alonre24 <[email protected]>

Author: 3 people

.circleci/config.yml

@@ -591,7 +591,6 @@ workflows:
           matrix:
             parameters:
               osnick:
-                - xenial
                 - bionic
                 - centos8
               lite:
@@ -605,7 +604,6 @@ workflows:
           matrix:
             parameters:
               osnick:
-                - xenial
                 - bionic
                 - centos8
               lite:

README.md

@@ -24,7 +24,7 @@ docker run -p 6379:6379 redislabs/redisai:latest-cpu-x64-bionic
 ```
 
 ### On a GPU machine
-For GPU support you will need a machine you'll need a machine that has Nvidia driver (CUDA 11.2 and cuDNN 8.1), nvidia-container-toolkit and Docker 19.03+ installed. For detailed information, checkout [nvidia-docker documentation](https://github.com/NVIDIA/nvidia-docker)
+For GPU support you will need a machine you'll need a machine that has Nvidia driver (CUDA 11.3 and cuDNN 8.1), nvidia-container-toolkit and Docker 19.03+ installed. For detailed information, checkout [nvidia-docker documentation](https://github.com/NVIDIA/nvidia-docker)
 
 ```
 docker run -p 6379:6379 --gpus all -it --rm redislabs/redisai:latest-gpu-x64-bionic
@@ -37,7 +37,7 @@ You can compile and build the module from its source code. The [Developer](https
 ### Prerequisites
 * Packages: git, python3, make, wget, g++/clang, & unzip
 * CMake 3.0 or higher needs to be installed.
-* CUDA 11.2 and cuDNN 8.1 or higher needs to be installed if GPU support is required.
+* CUDA 11.3 and cuDNN 8.1 or higher needs to be installed if GPU support is required.
 * Redis v6.0.0 or greater.
 
 ### Get the Source Code
@@ -90,7 +90,7 @@ RedisAI currently supports PyTorch (libtorch), Tensorflow (libtensorflow), Tenso
 |:--------|:-------:|:----------:|:------:|:-------------:|
 | 1.0.3   | 1.5.0   | 1.15.0     | 2.0.0  | 1.2.0         |
 | 1.2.5   | 1.9.0   | 2.6.0      | 2.0.0  | 1.9.0         |
-| master  | 1.9.0   | 2.6.0      | 2.0.0  | 1.9.0         |
+| master  | 1.10.1  | 2.6.0      | 2.0.0  | 1.9.0        |
 
 Note: Keras and TensorFlow 2.x are supported through graph freezing. See [this script](https://github.com/RedisAI/RedisAI/blob/master/tests/flow/test_data/tf2-minimal.py) to see how to export a frozen graph from Keras and TensorFlow 2.x.
 

get_deps.sh

@@ -6,7 +6,7 @@ ORT_VERSION="1.9.0"
 DLPACK_VERSION="v0.5_RAI"
 TF_VERSION="2.6.0"
 TFLITE_VERSION="2.0.0"
-PT_VERSION="1.9.0"
+PT_VERSION="1.10.1"
 
 ###### END VERSIONS ######
 
@@ -184,7 +184,7 @@ PT_BUILD=cpu
 if [[ $OS == linux ]]; then
     PT_OS=linux
     if [[ $GPU == 1 ]]; then
-        PT_BUILD=cu111
+        PT_BUILD=cu113
     fi
     if [[ $ARCH == x64 ]]; then
         PT_ARCH=x86_64

opt/build/docker/Makefile

@@ -2,7 +2,7 @@
 PRODUCT=redisai
 DOCKER_ORG=redislabs
 REDIS_VERSION=6.2.5
-REDIS_CUDA_VERSION=11.2.2-cudnn8
+REDIS_CUDA_VERSION=11.3.1-cudnn8
 REDISAI_LITE=0
 
 PACK=1 # to fetch the artifacts

opt/build/dockerparts/apt.yml

@@ -9,7 +9,7 @@ RUN add-apt-repository ppa:ubuntu-toolchain-r/test
 RUN apt-get update -qq
 RUN DEBIAN_NONINTERACTIVE=1 apt-get install -y curl wget tar git patch  \
 	build-essential libcurl4-openssl-dev libssl-dev libatlas-base-dev zlib1g-dev \
-    python3.7 python3-pip python3-dev python3-numpy \
+    python3.7 python3-pip python3-dev \
     gcc-7 g++-7
 
 RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.7 60

opt/system-setup.py

@@ -27,13 +27,9 @@ def common_first(self):
     def debian_compat(self):
         self.run("%s/bin/enable-utf8" % READIES)
         self.run("%s/bin/getgcc" % READIES)
-        self.install("gawk")
-        self.install("libssl-dev")
-        self.install("python3-regex")
-        self.install("python3-networkx python3-numpy")
+        self.install("gawk libssl-dev python3-regex python3-networkx libmpich-dev libopenblas-dev")
         if self.platform.is_arm():
             self.install("python3-dev") # python3-skimage
-        self.install("libmpich-dev libopenblas-dev") # for libtorch
         self.install_git_lfs_on_linux()
 
     def redhat_compat(self):

src/backends/util.c

@@ -1,21 +1,24 @@
+#include <stdlib.h>
+#include <errno.h>
 #include "backends/util.h"
 
-int parseDeviceStr(const char *devicestr, RAI_Device *device, int64_t *deviceid) {
-    // if (strcasecmp(devicestr, "CPU") == 0) {
-    if (strncasecmp(devicestr, "CPU", 3) == 0) {
+int parseDeviceStr(const char *device_str, RAI_Device *device, int64_t *device_id) {
+    if (strncasecmp(device_str, "CPU", 3) == 0) {
         *device = RAI_DEVICE_CPU;
-        *deviceid = -1;
-    } else if (strcasecmp(devicestr, "GPU") == 0) {
+        *device_id = -1;
+    } else if (strcasecmp(device_str, "GPU") == 0) {
         *device = RAI_DEVICE_GPU;
-        *deviceid = -1;
-    } else if (strncasecmp(devicestr, "GPU:", 4) == 0) {
+        *device_id = -1;
+    } else if (strncasecmp(device_str, "GPU:", 4) == 0) {
         *device = RAI_DEVICE_GPU;
-        long long id;
-        sscanf(devicestr, "GPU:%lld", &id);
-        *deviceid = id;
+        // Convert the id string into a number, returns zero if no valid conversion could be
+        // preformed, and sets errno in case of overflow.
+        long long id = strtoll(device_str + 4, NULL, 0);
+        if (errno == ERANGE)
+            return 0;
+        *device_id = id;
     } else {
         return 0;
     }
-
     return 1;
 }

src/backends/util.h

@@ -6,4 +6,4 @@
 
 #include "config/config.h"
 
-int parseDeviceStr(const char *devicestr, RAI_Device *device, int64_t *deviceid);
+int parseDeviceStr(const char *device_str, RAI_Device *device, int64_t *device_id);

src/redisai.c

@@ -173,12 +173,14 @@ int RedisAI_ModelStore_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **arg
     const char *devicestr;
     AC_GetString(&ac, &devicestr, NULL, 0);
     bool valid_device = false;
+    size_t device_prefix_len = strlen("GPU:"); // can also be "CPU:"
     if (strcasecmp(devicestr, "CPU") == 0 || strcasecmp(devicestr, "GPU") == 0) {
         valid_device = true;
-    } else if ((strncasecmp(devicestr, "GPU:", 4) == 0 || strncasecmp(devicestr, "CPU:", 4) == 0) &&
-               strlen(devicestr) <= 10) {
+    } else if ((strncasecmp(devicestr, "GPU:", device_prefix_len) == 0 ||
+                strncasecmp(devicestr, "CPU:", device_prefix_len) == 0) &&
+               strlen(devicestr) < 10) {
         bool digits_only = true;
-        for (size_t i = 5; i < strlen(devicestr); i++) {
+        for (size_t i = device_prefix_len; i < strlen(devicestr); i++) {
             if (devicestr[i] < '0' || devicestr[i] > '9') {
                 digits_only = false;
                 break;

src/serialization/RDB/decoder/previous/v0/decode_v0.c

@@ -1,5 +1,6 @@
 #include "decode_v0.h"
 #include "assert.h"
+#include "execution/run_queue_info.h"
 
 void *RAI_RDBLoadTensor_v0(RedisModuleIO *io) {
     DLDevice device;
@@ -138,6 +139,10 @@ void *RAI_RDBLoadModel_v0(RedisModuleIO *io) {
     RedisModule_FreeString(NULL, stats_keystr);
     RedisModule_FreeString(NULL, tag);
 
+    if (!RunQueue_IsExists(model->devicestr)) {
+        RunQueue_Create(model->devicestr);
+    }
+
     return model;
 
 cleanup:
@@ -215,6 +220,10 @@ void *RAI_RDBLoadScript_v0(RedisModuleIO *io) {
     RedisModule_Free(devicestr);
     RedisModule_Free(scriptdef);
 
+    if (!RunQueue_IsExists(script->devicestr)) {
+        RunQueue_Create(script->devicestr);
+    }
+
     return script;
 cleanup:
     if (devicestr)

src/serialization/RDB/decoder/previous/v1/decode_v1.c

@@ -1,5 +1,6 @@
 #include "decode_v1.h"
 #include "../v0/decode_v0.h"
+#include "execution/run_queue_info.h"
 
 /**
  * In case of IO errors, the default return values are:
@@ -114,6 +115,10 @@ void *RAI_RDBLoadModel_v1(RedisModuleIO *io) {
     RedisModule_FreeString(NULL, stats_keystr);
     RedisModule_FreeString(NULL, tag);
 
+    if (!RunQueue_IsExists(model->devicestr)) {
+        RunQueue_Create(model->devicestr);
+    }
+
     return model;
 
 cleanup:
@@ -187,6 +192,11 @@ void *RAI_RDBLoadScript_v1(RedisModuleIO *io) {
     RedisModule_FreeString(NULL, tag);
     RedisModule_Free(devicestr);
     RedisModule_Free(scriptdef);
+
+    if (!RunQueue_IsExists(script->devicestr)) {
+        RunQueue_Create(script->devicestr);
+    }
+
     return script;
 cleanup:
     if (devicestr)

src/serialization/RDB/decoder/previous/v2/decode_v2.c

@@ -1,5 +1,6 @@
 #include "decode_v2.h"
 #include "../v0/decode_v0.h"
+#include "execution/run_queue_info.h"
 
 /**
  * In case of IO errors, the default return values are:
@@ -116,6 +117,10 @@ void *RAI_RDBLoadModel_v2(RedisModuleIO *io) {
     RedisModule_FreeString(NULL, stats_keystr);
     RedisModule_FreeString(NULL, tag);
 
+    if (!RunQueue_IsExists(model->devicestr)) {
+        RunQueue_Create(model->devicestr);
+    }
+
     return model;
 
 cleanup:
@@ -189,6 +194,10 @@ void *RAI_RDBLoadScript_v2(RedisModuleIO *io) {
     RedisModule_FreeString(NULL, tag);
     RedisModule_Free(devicestr);
     RedisModule_Free(scriptdef);
+
+    if (!RunQueue_IsExists(script->devicestr)) {
+        RunQueue_Create(script->devicestr);
+    }
     return script;
 cleanup:
     if (devicestr)

src/serialization/RDB/decoder/previous/v3/decode_v3.c

@@ -1,5 +1,6 @@
 #include "decode_v3.h"
 #include "../v0/decode_v0.h"
+#include "execution/run_queue_info.h"
 
 /**
  * In case of IO errors, the default return values are:
@@ -116,6 +117,10 @@ void *RAI_RDBLoadModel_v3(RedisModuleIO *io) {
     RedisModule_FreeString(NULL, stats_keystr);
     RedisModule_FreeString(NULL, tag);
 
+    if (!RunQueue_IsExists(model->devicestr)) {
+        RunQueue_Create(model->devicestr);
+    }
+
     return model;
 
 cleanup:
@@ -208,6 +213,11 @@ void *RAI_RDBLoadScript_v3(RedisModuleIO *io) {
         RedisModule_Free(entryPoints[i]);
     }
     array_free(entryPoints);
+
+    if (!RunQueue_IsExists(script->devicestr)) {
+        RunQueue_Create(script->devicestr);
+    }
+
     return script;
 cleanup:
     if (devicestr)

src/version.h

@@ -2,7 +2,7 @@
 
 #define REDISAI_VERSION_MAJOR 1
 #define REDISAI_VERSION_MINOR 2
-#define REDISAI_VERSION_PATCH 5
+#define REDISAI_VERSION_PATCH 6
 
 #define REDISAI_MODULE_VERSION                                                                     \
     (REDISAI_VERSION_MAJOR * 10000 + REDISAI_VERSION_MINOR * 100 + REDISAI_VERSION_PATCH)