[add] fixed merge conflicts

Author: filipecosta90

src/redisai.c

@@ -178,7 +178,7 @@ int RAI_GetTensorFromKeyspace(RedisModuleCtx *ctx, RedisModuleString *keyName,
 
 /* Return REDISMODULE_ERR if there was an error getting the Tensor.
  * Return REDISMODULE_OK if the tensor value is present at the localContextDict. */
-int RAI_GetTensorFromLocalContext(RedisModuleCtx *ctx,
+int RAI_getTensorFromLocalContext(RedisModuleCtx *ctx,
                                   AI_dict *localContextDict,
                                   const char *localContextKey,
                                   RAI_Tensor **tensor) {
@@ -825,22 +825,6 @@ 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;
@@ -919,13 +903,6 @@ 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")) {
@@ -951,10 +928,6 @@ 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)) {
@@ -1080,11 +1053,8 @@ int RedisAI_ModelSet_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **argv,
 
   RedisModule_ReplicateVerbatim(ctx);
 
-  size_t ninputs = inac.argc;
-  const char *inputs[ninputs];
-  for (size_t i=0; i<ninputs; i++) {
-    AC_GetString(&inac, inputs+i, NULL, 0); 
-  }
+  return REDISMODULE_OK;
+}
 
 /**
 * AI.MODELGET model_key [META | BLOB]
@@ -1107,8 +1077,6 @@ 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};
@@ -1259,7 +1227,7 @@ int RedisAI_Parse_ModelRun_RedisCommand(RedisModuleCtx *ctx,
           }
           RedisModule_CloseKey(tensorKey);
         } else {
-          const int get_result = RAI_GetTensorFromLocalContext(
+          const int get_result = RAI_getTensorFromLocalContext(
               ctx, *localContextDict, arg_string, &inputTensor);
           if (get_result == REDISMODULE_ERR) {
             return -1;
@@ -1970,7 +1938,7 @@ int RedisAI_DagRun_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **argv,
       const char *key_string = RedisModule_StringPtrLen(argv[argpos + 1], NULL);
       RAI_Tensor *t = NULL;
       const int get_result =
-          RAI_GetTensorFromLocalContext(ctx, dagTensorsContext, key_string, &t);
+          RAI_getTensorFromLocalContext(ctx, dagTensorsContext, key_string, &t);
       if (get_result == REDISMODULE_OK) {
         const int parse_result =
             RAI_parseTensorGetArgs(ctx, &argv[argpos], argc - argpos, t);