Merge branch 'master' into perf-dagrun

Author: filipecosta90

src/redisai.c

@@ -825,6 +825,22 @@ int RAI_parseTensorGetArgs(RedisModuleCtx *ctx, RedisModuleString **argv, int ar
         }
         RedisModule_ReplyWithDouble(ctx, val);
       }
+      argpos++;
+      break;
+    } else {
+      long long dimension = 1;
+      const int retval = RedisModule_StringToLongLong(argv[argpos],&dimension);
+      if (retval != REDISMODULE_OK || dimension <= 0) {
+          RedisModule_Free(dims);
+          RedisModule_CloseKey(key);
+          return RedisModule_ReplyWithError(ctx,
+              "ERR invalid or negative value found in tensor shape");
+      }
+      
+      ndims++;
+      dims=RedisModule_Realloc(dims,ndims*sizeof(long long));
+      dims[ndims-1]=dimension;
+      len *= dimension;
     }
     else {
       long long val;
@@ -903,6 +919,13 @@ int RedisAI_ModelSet_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **argv,
   if (strlen(devicestr) > 10) {
     return RedisModule_ReplyWithError(ctx, "ERR Invalid DEVICE");
   }
+  else if (datafmt == REDISAI_DATA_VALUES) {
+    long long ndims = RAI_TensorNumDims(t);
+    long long len = 1;
+    long long i;
+    for (i=0; i<ndims; i++) {
+      len *= RAI_TensorDim(t, i);
+    }
 
   const char* tag = "";
   if (AC_AdvanceIfMatch(&ac, "TAG")) {
@@ -928,6 +951,10 @@ int RedisAI_ModelSet_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **argv,
       return RedisModule_ReplyWithError(ctx, "ERR Invalid argument for MINBATCHSIZE");
     }
   }
+  RedisModule_CloseKey(key);
+
+  return REDISMODULE_OK;
+}
 
 
   if (AC_IsAtEnd(&ac)) {
@@ -1053,8 +1080,11 @@ int RedisAI_ModelSet_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **argv,
 
   RedisModule_ReplicateVerbatim(ctx);
 
-  return REDISMODULE_OK;
-}
+  size_t ninputs = inac.argc;
+  const char *inputs[ninputs];
+  for (size_t i=0; i<ninputs; i++) {
+    AC_GetString(&inac, inputs+i, NULL, 0); 
+  }
 
 /**
 * AI.MODELGET model_key [META | BLOB]
@@ -1077,6 +1107,8 @@ int RedisAI_ModelGet_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **argv,
     else if (!strcasecmp(optstr, "BLOB")) {
       blob = 1;
     }
+    RAI_ClearError(&err);
+    model = RAI_ModelCreate(backend, devicestr, tag, opts, ninputs, inputs, noutputs, outputs, modeldef, modellen, &err);
   }
 
   RAI_Error err = {0};