GPU bug fix

Author: alonre24

src/DAG/dag.c

@@ -294,11 +294,8 @@ size_t RAI_DagOpBatchSize(RAI_DagOp *op, RedisAI_RunInfo *rinfo) {
     }
 
     size_t ninputs = array_len(op->inkeys);
-    size_t batchsize = 0;
+    int batchsize = 0;
 
-    if (!rinfo->single_op_dag) {
-        RAI_ContextReadLock(rinfo);
-    }
     for (size_t i = 0; i < ninputs; i++) {
         RAI_Tensor *input;
         if (rinfo->single_op_dag) {
@@ -322,9 +319,6 @@ size_t RAI_DagOpBatchSize(RAI_DagOp *op, RedisAI_RunInfo *rinfo) {
             break;
         }
     }
-    if (!rinfo->single_op_dag) {
-        RAI_ContextUnlock(rinfo);
-    }
     return batchsize;
 }
 
@@ -454,7 +448,10 @@ void RedisAI_DagOpBatchInfo(RedisAI_RunInfo *rinfo, RAI_DagOp *op, size_t *batch
     *batchsize = op->mctx->model->opts.batchsize;
     *minbatchsize = op->mctx->model->opts.minbatchsize;
     *minbatchtimeout = op->mctx->model->opts.minbatchtimeout;
+
+    RAI_ContextReadLock(rinfo);
     *inbatchsize = RAI_DagOpBatchSize(op, rinfo);
+    RAI_ContextUnlock(rinfo);
 }
 
 void RedisAI_DagOpBatchingMatch(RedisAI_RunInfo *rinfo1, RAI_DagOp *op1, RedisAI_RunInfo *rinfo2,

src/command_parser.c

@@ -34,7 +34,11 @@ static int _ModelRunCommand_ParseArgs(RedisModuleCtx *ctx, RedisModuleString **a
         RAI_SetError(error, RAI_EMODELRUN, "ERR Model not found");
         return REDISMODULE_ERR;
     }
-    RedisModule_HoldString(NULL, argv[argpos]);
+    if (RMAPI_FUNC_SUPPORTED(RedisModule_HoldString)) {
+        RedisModule_HoldString(NULL, argv[argpos]);
+    } else {
+        RedisModule_RetainString(NULL, argv[argpos]);
+    }
     *runkey = argv[argpos];
     const char *arg_string = RedisModule_StringPtrLen(argv[++argpos], NULL);
 
@@ -58,7 +62,11 @@ static int _ModelRunCommand_ParseArgs(RedisModuleCtx *ctx, RedisModuleString **a
             is_input = false;
             is_output = true;
         } else {
-            RedisModule_HoldString(NULL, argv[argpos]);
+            if (RMAPI_FUNC_SUPPORTED(RedisModule_HoldString)) {
+                RedisModule_HoldString(NULL, argv[argpos]);
+            } else {
+                RedisModule_RetainString(NULL, argv[argpos]);
+            }
             if (is_input) {
                 ninputs++;
                 *inkeys = array_append(*inkeys, argv[argpos]);

src/modelRun_ctx.c

@@ -98,7 +98,11 @@ int RedisAI_Parse_ModelRun_RedisCommand(RedisModuleCtx *ctx, RedisModuleString *
             is_input = 1;
             outputs_flag_count = 1;
         } else {
-            RedisModule_HoldString(ctx, argv[argpos]);
+            if (RMAPI_FUNC_SUPPORTED(RedisModule_HoldString)) {
+                RedisModule_HoldString(NULL, argv[argpos]);
+            } else {
+                RedisModule_RetainString(NULL, argv[argpos]);
+            }
             if (is_input == 0) {
                 *inkeys = array_append(*inkeys, argv[argpos]);
                 ninputs++;