wip

Author: DvirDukhan

src/CMakeLists.txt

@@ -40,6 +40,9 @@ ADD_LIBRARY(redisai_obj OBJECT
         rmutil/heap.c
         rmutil/priority_queue.c
         rmutil/vector.c run_info.c
+        redis_ai_types/model_type.c
+        redis_ai_types/tensor_type.c
+        redis_ai_types/script_type.c
         ${SERIALIZATION_SRC}
 		${DEBUG_SRC})
 

src/model.c

@@ -40,7 +40,7 @@ int RAI_GetModelFromKeyspace(RedisModuleCtx *ctx, RedisModuleString *keyName, Re
     return REDISMODULE_OK;
 }
 
-RAI_Model *RAI_ModelCreate(RAI_Backend backend, const char *devicestr, const char *tag,
+RAI_Model *RAI_ModelCreate(RAI_Backend backend, const char *devicestr, RedisModuleString *tag,
                            RAI_ModelOpts opts, size_t ninputs, const char **inputs, size_t noutputs,
                            const char **outputs, const char *modeldef, size_t modellen,
                            RAI_Error *err) {

src/redis_ai_types/model_type.c

@@ -1,8 +1,9 @@
 #include "model_type.h"
-#include "../AOF/rai_aof_rewrite.h"
-#include "../RDB/encoder/rai_rdb_encode.h"
-#include "../RDB/decoder/rai_rdb_decoder.h"
-#include "../RDB/decoder/decode_previous.h"
+#include "../model.h"
+#include "../serialization/AOF/rai_aof_rewrite.h"
+#include "../serialization/RDB/encoder/rai_rdb_encode.h"
+#include "../serialization/RDB/decoder/rai_rdb_decoder.h"
+#include "../serialization/RDB/decoder/decode_previous.h"
 
 extern RedisModuleType *RedisAI_ModelType;
 

src/redis_ai_types/tensor_type.h

@@ -1,5 +1,5 @@
 #pragma once
 
-#include "serialization/serialization_include.h"
+#include "redismodule.h"
 
 int TensorType_Register(RedisModuleCtx *ctx);

src/script.c

@@ -17,7 +17,7 @@
 #include "version.h"
 #include <pthread.h>
 
-RAI_Script *RAI_ScriptCreate(const char *devicestr, const char *tag, const char *scriptdef,
+RAI_Script *RAI_ScriptCreate(const char *devicestr, RedisModuleString *tag, const char *scriptdef,
                              RAI_Error *err) {
     if (!RAI_backends.torch.script_create) {
         RAI_SetError(err, RAI_EBACKENDNOTLOADED, "ERR Backend not loaded: TORCH");

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

@@ -73,7 +73,7 @@ void *RAI_RDBLoadTensor_v1(RedisModuleIO *io) {
 void *RAI_RDBLoadModel_v1(RedisModuleIO *io) {
 
     char *devicestr = NULL;
-    char *tag = NULL;
+    RedisModuleString *tag = NULL;
     size_t ninputs = 0;
     const char **inputs = NULL;
     size_t noutputs = 0;
@@ -82,7 +82,7 @@ void *RAI_RDBLoadModel_v1(RedisModuleIO *io) {
 
     RAI_Backend backend = RedisModule_LoadUnsigned(io);
     devicestr = RedisModule_LoadStringBuffer(io, NULL);
-    tag = RedisModule_LoadStringBuffer(io, NULL);
+    tag = RedisModule_LoadString(io);
 
     const size_t batchsize = RedisModule_LoadUnsigned(io);
     const size_t minbatchsize = RedisModule_LoadUnsigned(io);
@@ -203,13 +203,13 @@ void *RAI_RDBLoadModel_v1(RedisModuleIO *io) {
 }
 
 void *RAI_RDBLoadScript_v1(RedisModuleIO *io) {
-    char *tag = NULL;
+    RedisModuleString *tag = NULL;
     char *devicestr = NULL;
     char *scriptdef = NULL;
     RAI_Error err = {0};
 
     devicestr = RedisModule_LoadStringBuffer(io, NULL);
-    tag = RedisModule_LoadStringBuffer(io, NULL);
+    tag = RedisModule_LoadString(io);
 
     size_t len;
     scriptdef = RedisModule_LoadStringBuffer(io, &len);

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

@@ -65,7 +65,7 @@ void *RAI_RDBLoadTensor_v0(RedisModuleIO *io) {
 
 void *RAI_RDBLoadModel_v0(RedisModuleIO *io) {
     char *devicestr = NULL;
-    char *tag = NULL;
+    RedisModuleString *tag = NULL;
     size_t ninputs = 0;
     const char **inputs = NULL;
     size_t noutputs = 0;
@@ -74,7 +74,7 @@ void *RAI_RDBLoadModel_v0(RedisModuleIO *io) {
 
     RAI_Backend backend = RedisModule_LoadUnsigned(io);
     devicestr = RedisModule_LoadStringBuffer(io, NULL);
-    tag = RedisModule_LoadStringBuffer(io, NULL);
+    tag = RedisModule_LoadString(io);
 
     const size_t batchsize = RedisModule_LoadUnsigned(io);
     const size_t minbatchsize = RedisModule_LoadUnsigned(io);
@@ -183,13 +183,13 @@ void *RAI_RDBLoadModel_v0(RedisModuleIO *io) {
 }
 
 void *RAI_RDBLoadScript_v0(RedisModuleIO *io) {
-    char *tag = NULL;
+    RedisModuleString *tag = NULL;
     char *devicestr = NULL;
     char *scriptdef = NULL;
     RAI_Error err = {0};
 
     devicestr = RedisModule_LoadStringBuffer(io, NULL);
-    tag = RedisModule_LoadStringBuffer(io, NULL);
+    tag = RedisModule_LoadString(io);
 
     size_t len;
     scriptdef = RedisModule_LoadStringBuffer(io, &len);

src/serialization/RDB/encoder/v1/encode_v1.c

@@ -43,7 +43,7 @@ void RAI_RDBSaveModel_v1(RedisModuleIO *io, void *value) {
 
     RedisModule_SaveUnsigned(io, model->backend);
     RedisModule_SaveStringBuffer(io, model->devicestr, strlen(model->devicestr) + 1);
-    RedisModule_SaveStringBuffer(io, model->tag, strlen(model->tag) + 1);
+    RedisModule_SaveString(io, model->tag);
     RedisModule_SaveUnsigned(io, model->opts.batchsize);
     RedisModule_SaveUnsigned(io, model->opts.minbatchsize);
     RedisModule_SaveUnsigned(io, model->ninputs);
@@ -74,6 +74,6 @@ void RAI_RDBSaveScript_v1(RedisModuleIO *io, void *value) {
     size_t len = strlen(script->scriptdef) + 1;
 
     RedisModule_SaveStringBuffer(io, script->devicestr, strlen(script->devicestr) + 1);
-    RedisModule_SaveStringBuffer(io, script->tag, strlen(script->tag) + 1);
+    RedisModule_SaveString(io, script->tag);
     RedisModule_SaveStringBuffer(io, script->scriptdef, len);
 }

src/serialization/serialization_include.h

@@ -1,7 +1,9 @@
 #pragma once
 
-#include "../redismodule.h"
-#include "../tensor.h"
+#include "redismodule.h"
+#include "../stats.h"
 #include "../model.h"
+#include "../tensor.h"
+#include "../script.h"
 #include "../backends.h"
 #include "../version.h"