Merge branch 'master' into lite

Author: DvirDukhan

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()
 
 #----------------------------------------------------------------------------------------------

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

src/backends.h src/backends/backends.hsrc/backends.h renamed to src/backends/backends.h

@@ -1,11 +1,11 @@
-#include "tflite_c.h"
-#include <iostream>
 #include <sstream>
+#include <iostream>
+#include "tflite_c.h"
+#include "redismodule.h"
+#include "tensorflow/lite/model.h"
 #include "tensorflow/lite/interpreter.h"
 #include "tensorflow/lite/kernels/register.h"
-#include "tensorflow/lite/model.h"
 #include "tensorflow/lite/tools/evaluation/utils.h"
-#include "../redismodule.h"
 
 namespace {
 

src/libtflite_c/CMakeLists.txt src/backends/libtflite_c/CMakeLists.txtsrc/libtflite_c/CMakeLists.txt renamed to src/backends/libtflite_c/CMakeLists.txt

@@ -1,5 +1,4 @@
-#ifndef __TFLITE_C_H__
-#define __TFLITE_C_H__
+#pragma once
 
 #include "dlpack/dlpack.h"
 
@@ -30,5 +29,3 @@ const char *tfliteModelOutputNameAtIndex(void *modelCtx, size_t index, char **er
 #ifdef __cplusplus
 }
 #endif
-
-#endif // __TFLITE_C_H__

src/libtflite_c/tflite_c.cpp src/backends/libtflite_c/tflite_c.cppsrc/libtflite_c/tflite_c.cpp renamed to src/backends/libtflite_c/tflite_c.cpp

@@ -1,9 +1,9 @@
 #include "torch_c.h"
 #include "torch/torch.h"
+#include "redismodule.h"
+#include "ATen/Functions.h"
 #include "torch/csrc/jit/serialization/import.h"
 #include "torch/csrc/jit/api/compilation_unit.h"
-#include "ATen/Functions.h"
-#include "../redismodule.h"
 
 #include <iostream>
 #include <sstream>

src/libtflite_c/tflite_c.h src/backends/libtflite_c/tflite_c.hsrc/libtflite_c/tflite_c.h renamed to src/backends/libtflite_c/tflite_c.h

@@ -1,5 +1,4 @@
-#ifndef __TORCH_C_H__
-#define __TORCH_C_H__
+#pragma once
 
 #include "dlpack/dlpack.h"
 
@@ -43,5 +42,3 @@ size_t torchModelNumOutputs(void *modelCtx, char **error);
 #ifdef __cplusplus
 }
 #endif
-
-#endif // __TORCH_C_H__