RedisAI · DvirDukhan · Oct 24, 2021 · Oct 24, 2021 · Oct 24, 2021 · Oct 24, 2021
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -86,6 +86,7 @@ commands:
       - run:
           name: Setup build system
           command: |
+            clang-format --version
             ./opt/system-setup.py
 
   checkout-all:
@@ -220,7 +221,7 @@ commands:
 jobs:
   lint:
     docker:
-      - image: redislabsmodules/llvm-toolset:latest
+      - image: redisfab/rmbuilder:6.2.5-x64-buster
     steps:
       - abort_for_docs
       - abort_for_noci

diff --git a/opt/build/docker/dockerfile-gpu-test.tmpl b/opt/build/docker/dockerfile-gpu-test.tmpl
@@ -36,6 +36,8 @@ COPY ./tests/flow/tests_setup/test_requirements.txt tests/flow/tests_setup/
 COPY ./tests/flow/tests_setup/Install_RedisGears.sh tests/flow/tests_setup/
 COPY ./get_deps.sh .
 
+RUN apt-get -q install -y git
+
 RUN VENV=venv FORCE=1 ./opt/readies/bin/getpy3
 
 RUN set -e ;\

diff --git a/opt/build/docker/dockerfile.tmpl b/opt/build/docker/dockerfile.tmpl
@@ -30,8 +30,10 @@ COPY --from=redis /usr/local/ /usr/local/
 COPY ./opt/ opt/
 ADD ./tests/flow/ tests/flow/
 
-RUN FORCE=1 ./opt/readies/bin/getpy3
 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
 RUN ./opt/system-setup.py
 
 ARG DEPS_ARGS=""

diff --git a/opt/clang-check-all.sh b/opt/clang-check-all.sh
@@ -3,8 +3,8 @@
 # exit immediatly on error ( no need to keep checking )
 set -e
 
-CLANG_FMT_SRCS=$(find ../src/ \( -name '*.c' -o -name '*.cc'-o -name '*.cpp' -o -name '*.h' -o -name '*.hh' -o -name '*.hpp' \))
-CLANG_FMT_TESTS=$(find ../tests/ \( -name '*.c' -o -name '*.cc'-o -name '*.cpp' -o -name '*.h' -o -name '*.hh' -o -name '*.hpp' \))
+CLANG_FMT_SRCS=$(find ../src/ \( -name '*.c' -o -name '*.cc' -o -name '*.cpp' -o -name '*.h' -o -name '*.hh' -o -name '*.hpp' \))
+CLANG_FMT_TESTS=$(find ../tests/ \( -name '*.c' -o -name '*.cc' -o -name '*.cpp' -o -name '*.h' -o -name '*.hh' -o -name '*.hpp' \))
 
 for filename in $CLANG_FMT_SRCS; do
     echo "Checking $filename"

diff --git a/opt/clang-format-all.sh b/opt/clang-format-all.sh
@@ -3,8 +3,8 @@
 # exit immediatly on error ( no need to keep checking )
 set -e
 
-CLANG_FMT_SRCS=$(find ../src/ \( -name '*.c' -o -name '*.cc'-o -name '*.cpp' -o -name '*.h' -o -name '*.hh' -o -name '*.hpp' \))
-CLANG_FMT_TESTS=$(find ../tests/ \( -name '*.c' -o -name '*.cc'-o -name '*.cpp' -o -name '*.h' -o -name '*.hh' -o -name '*.hpp' \))
+CLANG_FMT_SRCS=$(find ../src/ \( -name '*.c' -o -name '*.cc' -o -name '*.cpp' -o -name '*.h' -o -name '*.hh' -o -name '*.hpp' \))
+CLANG_FMT_TESTS=$(find ../tests/ \( -name '*.c' -o -name '*.cc' -o -name '*.cpp' -o -name '*.h' -o -name '*.hh' -o -name '*.hpp' \))
 
 for filename in $CLANG_FMT_SRCS; do
     clang-format --verbose -style=file -i $filename

diff --git a/opt/readies b/opt/readies
diff --git a/src/backends/libtflite_c/tflite_c.cpp b/src/backends/libtflite_c/tflite_c.cpp
@@ -53,15 +53,13 @@ static DLDataType getDLDataType(const TfLiteTensor *tensor) {
     return dtype;
 }
 
-
 static DLDevice getDLDevice(const TfLiteTensor *tensor, const int64_t &device_id) {
     DLDevice device;
     device.device_id = device_id;
     device.device_type = DLDeviceType::kDLCPU;
     return device;
 }
 
-
 size_t dltensorBytes(DLManagedTensor *t) {
     int64_t *shape = t->dl_tensor.shape;
     size_t len = 1;
@@ -80,15 +78,15 @@ void copyToTfLiteTensor(std::shared_ptr<tflite::Interpreter> interpreter, int tf
     size_t nbytes = dltensorBytes(input);
     DLDataType dltensor_type = input->dl_tensor.dtype;
     const char *type_mismatch_msg = "Input tensor type doesn't match the type expected"
-                            " by the model definition";
+                                    " by the model definition";
 
     switch (tensor->type) {
     case kTfLiteUInt8:
-       if (dltensor_type.code != kDLUInt || dltensor_type.bits != 8) {
-           throw std::logic_error(type_mismatch_msg);
-       }
-       memcpy(interpreter->typed_tensor<uint8_t>(tflite_input), input->dl_tensor.data, nbytes);
-       break;
+        if (dltensor_type.code != kDLUInt || dltensor_type.bits != 8) {
+            throw std::logic_error(type_mismatch_msg);
+        }
+        memcpy(interpreter->typed_tensor<uint8_t>(tflite_input), input->dl_tensor.data, nbytes);
+        break;
     case kTfLiteInt64:
         if (dltensor_type.code != kDLInt || dltensor_type.bits != 64) {
             throw std::logic_error(type_mismatch_msg);
@@ -273,51 +271,47 @@ extern "C" void *tfliteLoadModel(const char *graph, size_t graphlen, DLDeviceTyp
     return ctx;
 }
 
-extern "C" size_t tfliteModelNumInputs(void* ctx, char** error) {
-    ModelContext *ctx_ = (ModelContext*) ctx;
+extern "C" size_t tfliteModelNumInputs(void *ctx, char **error) {
+    ModelContext *ctx_ = (ModelContext *)ctx;
     size_t ret = 0;
     try {
         auto interpreter = ctx_->interpreter;
-        ret =  interpreter->inputs().size();
-    }
-    catch(std::exception ex) {
+        ret = interpreter->inputs().size();
+    } catch (std::exception ex) {
         _setError(ex.what(), error);
     }
     return ret;
 }
 
-extern "C" const char* tfliteModelInputNameAtIndex(void* modelCtx, size_t index, char** error) {
-    ModelContext *ctx_ = (ModelContext*) modelCtx;
-    const char* ret = NULL;
+extern "C" const char *tfliteModelInputNameAtIndex(void *modelCtx, size_t index, char **error) {
+    ModelContext *ctx_ = (ModelContext *)modelCtx;
+    const char *ret = NULL;
     try {
         ret = ctx_->interpreter->GetInputName(index);
-    }
-    catch(std::exception ex) {
+    } catch (std::exception ex) {
         _setError(ex.what(), error);
     }
     return ret;
 }
 
-extern "C" size_t tfliteModelNumOutputs(void* ctx, char** error) {
-    ModelContext *ctx_ = (ModelContext*) ctx;
+extern "C" size_t tfliteModelNumOutputs(void *ctx, char **error) {
+    ModelContext *ctx_ = (ModelContext *)ctx;
     size_t ret = 0;
     try {
         auto interpreter = ctx_->interpreter;
-        ret =  interpreter->outputs().size();
-    }
-    catch(std::exception ex) {
+        ret = interpreter->outputs().size();
+    } catch (std::exception ex) {
         _setError(ex.what(), error);
     }
     return ret;
 }
 
-extern "C" const char* tfliteModelOutputNameAtIndex(void* modelCtx, size_t index, char** error) {
-    ModelContext *ctx_ = (ModelContext*) modelCtx;
-    const char* ret = NULL;
+extern "C" const char *tfliteModelOutputNameAtIndex(void *modelCtx, size_t index, char **error) {
+    ModelContext *ctx_ = (ModelContext *)modelCtx;
+    const char *ret = NULL;
     try {
         ret = ctx_->interpreter->GetOutputName(index);
-    }
-    catch(std::exception ex) {
+    } catch (std::exception ex) {
         _setError(ex.what(), error);
     }
     return ret;
@@ -352,11 +346,11 @@ extern "C" void tfliteRunModel(void *ctx, long n_inputs, DLManagedTensor **input
     bool need_reallocation = false;
     std::vector<int> dims;
     for (size_t i = 0; i < tflite_inputs.size(); i++) {
-        const TfLiteTensor* tflite_tensor = interpreter->tensor(tflite_inputs[i]);
+        const TfLiteTensor *tflite_tensor = interpreter->tensor(tflite_inputs[i]);
         int64_t ndim = inputs[i]->dl_tensor.ndim;
         int64_t *shape = inputs[i]->dl_tensor.shape;
         dims.resize(ndim);
-        for (size_t j=0; j < ndim; j++) {
+        for (size_t j = 0; j < ndim; j++) {
             dims[j] = shape[j];
         }
         if (!tflite::EqualArrayAndTfLiteIntArray(tflite_tensor->dims, dims.size(), dims.data())) {
+2 −0		.gitignore
+24 −4		bin/dockerwrapper
+9 −9		bin/getclang
+4 −1		bin/getcmake
+25 −20		bin/getgcc
+7 −7		bin/getpy2
+10 −10		bin/getpy3
+112 −33		bin/getredis
+3 −0		bin/getrmpytools
+11 −1		bin/getvalgrind
+1 −0		bin/system-setup.py
+0 −12		mk/docker.cross
+3 −0		mk/docker.native
+19 −8		mk/docker.rules
+1 −0		mk/main
+2 −1		mk/osnick.defs
+6 −1		paella/platform.py
+4 −2		paella/setup.py
+4 −3		shibumi/functions
+3 −0		templates/dockers/README.md
+16 −0		templates/dockers/redis_docker.yml
+6 −0		templates/dockers/setup_environment.yml