Merge branch 'master' into buid_onnx_on_xenial

Author: alonre24

CMakeLists.txt

@@ -44,7 +44,7 @@ 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 \
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/common.h -I${CMAKE_CURRENT_SOURCE_DIR}/opt")
+    ${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}")
 
@@ -98,6 +98,7 @@ GET_FILENAME_COMPONENT(installAbs
 #----------------------------------------------------------------------------------------------
 
 INCLUDE_DIRECTORIES(${depsAbs}/dlpack/include)
+INCLUDE_DIRECTORIES(src)
 IF(BUILD_TF)
     INCLUDE_DIRECTORIES(${depsAbs}/libtensorflow/include)
 ENDIF()
@@ -182,7 +183,7 @@ IF(BUILD_TFLITE)
     # Find TensorFlow Lite stuff and build our wrapper
     INCLUDE_DIRECTORIES(util/libtflite_c)
 
-    ADD_SUBDIRECTORY(src/libtflite_c)
+    ADD_SUBDIRECTORY(src/backends/libtflite_c)
 ENDIF()
 
 #----------------------------------------------------------------------------------------------
@@ -194,7 +195,7 @@ IF(BUILD_TORCH)
 
     INCLUDE_DIRECTORIES(util/libtorch_c)
 
-    ADD_SUBDIRECTORY(src/libtorch_c)
+    ADD_SUBDIRECTORY(src/backends/libtorch_c)
 ENDIF()
 
 #----------------------------------------------------------------------------------------------

opt/Makefile

@@ -215,14 +215,16 @@ lint-docker:
 
 #----------------------------------------------------------------------------------------------
 
+ifneq ($(PACK_DEPS),0)
+override PACK_DEPS:=1
+endif
+
 pack: $(INSTALLED_TARGET)
 	$(SHOW)find $(INSTALL_DIR) -name "*.so" -exec chmod +x {} \;
 	$(SHOW)mkdir -p $(ROOT)/bin/artifacts
-ifneq ($(PACK_DEPS),0)
-	$(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 DEPS=1 ./pack.sh
-else
-	$(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 DEPS=0 ./pack.sh
-endif
+	$(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) DEPS=$(PACK_DEPS) ./pack.sh
+	$(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) DEPS=$(PACK_DEPS) VARIANT=lite ./pack.sh
+	$(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) DEPS=$(PACK_DEPS) VARIANT=rce  ./pack.sh
 
 #----------------------------------------------------------------------------------------------
 

opt/pack.sh

@@ -100,11 +100,17 @@ pack_ramp() {
 
 		xtx_vars+=" -e NAME_$dep -e PATH_$dep -e SHA256_$dep"
 	done
-	
+
+	if [[ -z $VARIANT ]]; then
+		local rampfile=ramp.yml
+	else
+		local rampfile=ramp-${VARIANT}.yml
+	fi
+
 	python3 $READIES/xtx \
 		$xtx_vars \
 		-e DEVICE -e NUMVER -e SEMVER \
-		$ROOT/ramp.yml > /tmp/ramp.yml
+		$ROOT/$rampfile > /tmp/ramp.yml
 	rm -f /tmp/ramp.fname $packfile
 	$RAMP_PROG pack -m /tmp/ramp.yml --packname-file /tmp/ramp.fname --verbose --debug -o $packfile $product_so >/tmp/ramp.err 2>&1 || true
 	if [[ ! -e $packfile ]]; then
@@ -179,7 +185,7 @@ if [[ $RAMP == 1 ]]; then
 		exit 1
 	fi
 
-	echo "Building RAMP files ..."
+	echo "Building RAMP $VARIANT files ..."
 	SNAPSHOT=0 pack_ramp
 	SNAPSHOT=1 pack_ramp
 	echo "Done."

ramp-lite.yml

@@ -0,0 +1,38 @@
+display_name: RedisAI
+author: Tensorwerk and RedisLabs
+email: support@redislabs.com
+description: Serving tensors and executing deep learning graphs
+homepage: https://oss.redislabs.com/redisai/
+license: Redis Source Available License v1.0
+command_line_args: "BACKENDSPATH /var/opt/redislabs/modules/ai/{{NUMVER}}/deps"
+# command_line_args: "BACKENDSPATH /var/opt/redislabs/modules/ai/{{NUMVER}}/deps/backends"
+min_redis_version: "5.0.7"
+min_redis_pack_version: "5.4.14"
+capabilities:
+    - types
+    - hash_policy
+    - eviction_expiry
+    - failover_migrate
+    - persistence_rdb
+    - persistence_aof
+    - clustering
+    - backup_restore
+    - replica_of
+    - flash
+    - resharding
+dependencies:
+    {{NAME_tensorflow}}:
+        url: http://redismodules.s3.amazonaws.com/redisai/{{PATH_tensorflow}}
+        sha256: {{SHA256_tensorflow}}
+    {{NAME_torch}}:
+        url: http://redismodules.s3.amazonaws.com/redisai/{{PATH_torch}}
+        sha256: {{SHA256_torch}}
+    {{NAME_onnxruntime}}:
+        url: http://redismodules.s3.amazonaws.com/redisai/{{PATH_onnxruntime}}
+        sha256: {{SHA256_onnxruntime}}
+    {{NAME_tflite}}:
+        url: http://redismodules.s3.amazonaws.com/redisai/{{PATH_tflite}}
+        sha256: {{SHA256_tflite}}
+#    {{NAME_all}}:
+#        url: http://redismodules.s3.amazonaws.com/redisai/{{PATH_all}}
+#        sha256: {{SHA256_all}}

ramp-rce.yml

@@ -0,0 +1,27 @@
+display_name: RedisAI
+author: Tensorwerk and RedisLabs
+email: support@redislabs.com
+description: Serving tensors and executing deep learning graphs
+homepage: https://oss.redislabs.com/redisai/
+license: Redis Source Available License v1.0
+command_line_args: "BACKENDSPATH /var/opt/redislabs/modules/ai/{{NUMVER}}/deps"
+# command_line_args: "BACKENDSPATH /var/opt/redislabs/modules/ai/{{NUMVER}}/deps/backends"
+min_redis_version: "5.0.7"
+min_redis_pack_version: "5.4.14"
+capabilities:
+    - types
+    - hash_policy
+    - eviction_expiry
+    - failover_migrate
+    - persistence_rdb
+    - persistence_aof
+    - clustering
+    - backup_restore
+    - replica_of
+    - flash
+    - resharding
+dependencies:
+    {{NAME_onnxruntime}}:
+        url: http://redismodules.s3.amazonaws.com/redisai/{{PATH_onnxruntime}}
+        sha256: {{SHA256_onnxruntime}}
+

ramp.yml

@@ -17,8 +17,6 @@ capabilities:
     - persistence_aof
     - clustering
     - backup_restore
-    - replica_of
-    - flash
 exclude_commands:
     - ai.modelset
     - ai.modeldel

src/CMakeLists.txt

@@ -3,19 +3,19 @@ if (CMAKE_BUILD_TYPE STREQUAL Debug)
 endif()
 
 file (GLOB_RECURSE SERIALIZATION_SRC 
-        tensor.c
-        model.c
-        script.c
-        backends.c
+        redis_ai_objects/tensor.c
+        redis_ai_objects/model.c
+        redis_ai_objects/script.c
+        backends/backends.c
         stats.c
         config.c
         serialization/*.c)
 
 file (GLOB BACKEND_COMMON_SRC
         backends/util.c
-        err.c
+        redis_ai_objects/err.c
         util/dict.c
-        tensor.c
+        redis_ai_objects/tensor.c
         util/string_utils.c
         serialization/ai_datatypes.c)
 
@@ -24,28 +24,26 @@ ADD_LIBRARY(redisai_obj OBJECT
         util/queue.c
         util/string_utils.c
         redisai.c
-        command_parser.c
-        run_info.c
-        background_workers.c
-        config.c
-        DAG/dag.c
-        DAG/dag_parser.c
-        DAG/dag_builder.c
-        DAG/dag_execute.c
-        modelRun_ctx.c
-        backends.c
+        execution/command_parser.c
+        execution/run_info.c
+        execution/background_workers.c
+        config/config.c
+        execution/DAG/dag.c
+        execution/DAG/dag_parser.c
+        execution/DAG/dag_builder.c
+        execution/DAG/dag_execute.c
+        execution/modelRun_ctx.c
+        backends/backends.c
         backends/util.c
-        model.c
-        err.c
-        script.c
-        stats.c
-        tensor.c
+        redis_ai_objects/model.c
+        redis_ai_objects/err.c
+        redis_ai_objects/script.c
+        redis_ai_objects/stats.c
+        redis_ai_objects/tensor.c
         rmutil/alloc.c
         rmutil/sds.c
         rmutil/args.c
-        rmutil/heap.c
-        rmutil/priority_queue.c
-        rmutil/vector.c run_info.c
+        execution/run_info.c
         redis_ai_types/model_type.c
         redis_ai_types/tensor_type.c
         redis_ai_types/script_type.c

src/backends.c src/backends/backends.csrc/backends.c renamed to src/backends/backends.c

@@ -6,14 +6,13 @@
  *
  */
 
-#ifndef SRC_BACKENDS_H_
-#define SRC_BACKENDS_H_
+#pragma once
 
-#include "config.h"
-#include "err.h"
-#include "model_struct.h"
-#include "script_struct.h"
-#include "tensor.h"
+#include "config/config.h"
+#include "redis_ai_objects/err.h"
+#include "redis_ai_objects/tensor.h"
+#include "redis_ai_objects/model_struct.h"
+#include "redis_ai_objects/script_struct.h"
 
 /*
  * To register a new backend to be loaded by the module, the backend needs to
@@ -98,5 +97,3 @@ int RAI_LoadBackend(RedisModuleCtx *ctx, int backend, const char *path);
 int RAI_LoadDefaultBackend(RedisModuleCtx *ctx, int backend);
 
 const char *RAI_BackendName(int backend);
-
-#endif