Skip to content

Commit 17300b1

Browse files
alonre24alonre24
committed
Rename enum RedisAI_DataFmt to RedisAI_TensorFmt
1 parent 9498574 commit 17300b1

File tree

5 files changed

+32
-32
lines changed

5 files changed

+32
-32
lines changed

‎src/DAG/dag_parser.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ int _ParseDAGOps(RedisModuleCtx *ctx, RedisAI_RunInfo *rinfo) {
316316
RAI_HoldString(NULL, currentOp->argv[1]);
317317
currentOp->inkeys = array_append(currentOp->inkeys, currentOp->argv[1]);
318318
currentOp->fmt = ParseTensorGetArgs(ctx, currentOp->argv, currentOp->argc);
319-
if (currentOp->fmt == REDISAI_DATA_NONE)
319+
if (currentOp->fmt == REDISAI_TENSOR_NONE)
320320
return REDISMODULE_ERR;
321321
continue;
322322
}

‎src/redisai.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ int RedisAI_TensorGet_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **argv
139139
return REDISMODULE_ERR;
140140
}
141141

142-
RedisAI_DataFmt fmt = ParseTensorGetArgs(ctx, argv, argc);
143-
if (fmt == REDISAI_DATA_NONE) {
142+
RedisAI_TensorFmt fmt = ParseTensorGetArgs(ctx, argv, argc);
143+
if (fmt == REDISAI_TENSOR_NONE) {
144144
// This means that args are invalid.
145145
return REDISMODULE_ERR;
146146
}

‎src/run_info.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ typedef struct RAI_DagOp {
3636
RAI_Tensor *outTensor; // The tensor to upload in TENSORSET op.
3737
RAI_ModelRunCtx *mctx;
3838
RAI_ScriptRunCtx *sctx;
39-
RedisAI_DataFmt fmt; // This is relevant for TENSORGET op.
39+
RedisAI_TensorFmt fmt; // This is relevant for TENSORGET op.
4040
char *devicestr;
4141
int result; // REDISMODULE_OK or REDISMODULE_ERR
4242
long long duration_us;

‎src/tensor.c‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ int RAI_parseTensorSetArgs(RedisModuleCtx *ctx, RedisModuleString **argv, int ar
657657
return -1;
658658
}
659659
const char *fmtstr;
660-
int datafmt = REDISAI_DATA_NONE;
660+
int datafmt = REDISAI_TENSOR_NONE;
661661
int tensorAllocMode = TENSORALLOC_CALLOC;
662662
size_t ndims = 0;
663663
long long len = 1;
@@ -671,7 +671,7 @@ int RAI_parseTensorSetArgs(RedisModuleCtx *ctx, RedisModuleString **argv, int ar
671671
const char *opt = RedisModule_StringPtrLen(argv[argpos], NULL);
672672
remaining_args = argc - 1 - argpos;
673673
if (!strcasecmp(opt, "BLOB")) {
674-
datafmt = REDISAI_DATA_BLOB;
674+
datafmt = REDISAI_TENSOR_BLOB;
675675
tensorAllocMode = TENSORALLOC_CALLOC;
676676
// if we've found the dataformat there are no more dimensions
677677
// check right away if the arity is correct
@@ -688,7 +688,7 @@ int RAI_parseTensorSetArgs(RedisModuleCtx *ctx, RedisModuleString **argv, int ar
688688
argpos++;
689689
break;
690690
} else if (!strcasecmp(opt, "VALUES")) {
691-
datafmt = REDISAI_DATA_VALUES;
691+
datafmt = REDISAI_TENSOR_VALUES;
692692
tensorAllocMode = TENSORALLOC_CALLOC;
693693
// if we've found the dataformat there are no more dimensions
694694
// check right away if the arity is correct
@@ -728,7 +728,7 @@ int RAI_parseTensorSetArgs(RedisModuleCtx *ctx, RedisModuleString **argv, int ar
728728
size_t datalen;
729729
const char *data;
730730
DLDataType datatype = RAI_TensorDataTypeFromString(typestr);
731-
if (datafmt == REDISAI_DATA_BLOB) {
731+
if (datafmt == REDISAI_TENSOR_BLOB) {
732732
RedisModuleString *rstr = argv[argpos];
733733
RedisModule_RetainString(NULL, rstr);
734734
*t = RAI_TensorCreateWithDLDataTypeAndRString(datatype, dims, ndims, rstr);
@@ -746,7 +746,7 @@ int RAI_parseTensorSetArgs(RedisModuleCtx *ctx, RedisModuleString **argv, int ar
746746
return -1;
747747
}
748748
long i = 0;
749-
if (datafmt == REDISAI_DATA_VALUES) {
749+
if (datafmt == REDISAI_TENSOR_VALUES) {
750750
for (; (argpos <= argc - 1) && (i < len); argpos++) {
751751
if (datatype.code == kDLFloat) {
752752
double val;
@@ -845,8 +845,8 @@ int RAI_TensorReplyWithValues(RedisModuleCtx *ctx, RAI_Tensor *t) {
845845
return 0;
846846
}
847847

848-
RedisAI_DataFmt ParseTensorGetArgs(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
849-
RedisAI_DataFmt fmt = REDISAI_DATA_NONE;
848+
RedisAI_TensorFmt ParseTensorGetArgs(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
849+
RedisAI_TensorFmt fmt = REDISAI_TENSOR_NONE;
850850
if (argc < 2 || argc > 4) {
851851
RedisModule_WrongArity(ctx);
852852
return fmt;
@@ -877,27 +877,27 @@ RedisAI_DataFmt ParseTensorGetArgs(RedisModuleCtx *ctx, RedisModuleString **argv
877877
return fmt;
878878
}
879879
if (blob_arg && !meta_arg)
880-
return REDISAI_DATA_BLOB;
880+
return REDISAI_TENSOR_BLOB;
881881
if (values_arg && !meta_arg)
882-
return REDISAI_DATA_VALUES;
882+
return REDISAI_TENSOR_VALUES;
883883
if (blob_arg && meta_arg)
884-
return REDISAI_DATA_BLOB_WITH_META;
884+
return REDISAI_TENSOR_BLOB_WITH_META;
885885
if (values_arg && meta_arg)
886-
return REDISAI_DATA_VALUES_WITH_META;
886+
return REDISAI_TENSOR_VALUES_WITH_META;
887887
if (!blob_arg && !values_arg && meta_arg)
888-
return REDISAI_DATA_META;
888+
return REDISAI_TENSOR_META;
889889
return fmt;
890890
}
891891

892-
int ReplyWithTensor(RedisModuleCtx *ctx, RedisAI_DataFmt fmt, RAI_Tensor *t) {
892+
int ReplyWithTensor(RedisModuleCtx *ctx, RedisAI_TensorFmt fmt, RAI_Tensor *t) {
893893

894-
if (fmt == REDISAI_DATA_BLOB) {
894+
if (fmt == REDISAI_TENSOR_BLOB) {
895895
long long size = RAI_TensorByteSize(t);
896896
char *data = RAI_TensorData(t);
897897
RedisModule_ReplyWithStringBuffer(ctx, data, size);
898898
return REDISMODULE_OK;
899899
}
900-
if (fmt == REDISAI_DATA_VALUES) {
900+
if (fmt == REDISAI_TENSOR_VALUES) {
901901
int ret = RAI_TensorReplyWithValues(ctx, t);
902902
if (ret == -1) {
903903
return REDISMODULE_ERR;
@@ -906,7 +906,7 @@ int ReplyWithTensor(RedisModuleCtx *ctx, RedisAI_DataFmt fmt, RAI_Tensor *t) {
906906
}
907907

908908
long long resplen = 4;
909-
if (fmt == REDISAI_DATA_BLOB_WITH_META || fmt == REDISAI_DATA_VALUES_WITH_META)
909+
if (fmt == REDISAI_TENSOR_BLOB_WITH_META || fmt == REDISAI_TENSOR_VALUES_WITH_META)
910910
resplen += 2;
911911

912912
const long long ndims = RAI_TensorNumDims(t);
@@ -929,13 +929,13 @@ int ReplyWithTensor(RedisModuleCtx *ctx, RedisAI_DataFmt fmt, RAI_Tensor *t) {
929929
RedisModule_ReplyWithLongLong(ctx, dim);
930930
}
931931

932-
if (fmt == REDISAI_DATA_BLOB_WITH_META) {
932+
if (fmt == REDISAI_TENSOR_BLOB_WITH_META) {
933933
long long size = RAI_TensorByteSize(t);
934934
char *data = RAI_TensorData(t);
935935
RedisModule_ReplyWithCString(ctx, "blob");
936936
RedisModule_ReplyWithStringBuffer(ctx, data, size);
937937

938-
} else if (fmt == REDISAI_DATA_VALUES_WITH_META) {
938+
} else if (fmt == REDISAI_TENSOR_VALUES_WITH_META) {
939939
RedisModule_ReplyWithCString(ctx, "values");
940940
int ret = RAI_TensorReplyWithValues(ctx, t);
941941
if (ret != REDISMODULE_OK) {

‎src/tensor.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ static const char *RAI_DATATYPE_STR_INT64 = "INT64";
3333
static const char *RAI_DATATYPE_STR_UINT8 = "UINT8";
3434
static const char *RAI_DATATYPE_STR_UINT16 = "UINT16";
3535

36-
typedef enum RedisAI_DataFmt {
37-
REDISAI_DATA_NONE = 0,
38-
REDISAI_DATA_VALUES,
39-
REDISAI_DATA_META,
40-
REDISAI_DATA_BLOB_WITH_META,
41-
REDISAI_DATA_VALUES_WITH_META,
42-
REDISAI_DATA_BLOB
43-
} RedisAI_DataFmt;
36+
typedef enum RedisAI_TensorFmt {
37+
REDISAI_TENSOR_NONE = 0,
38+
REDISAI_TENSOR_VALUES,
39+
REDISAI_TENSOR_META,
40+
REDISAI_TENSOR_BLOB_WITH_META,
41+
REDISAI_TENSOR_VALUES_WITH_META,
42+
REDISAI_TENSOR_BLOB
43+
} RedisAI_TensorFmt;
4444

4545
extern RedisModuleType *RedisAI_TensorType;
4646

@@ -387,7 +387,7 @@ int RAI_parseTensorSetArgs(RedisModuleCtx *ctx, RedisModuleString **argv, int ar
387387
* @return The format in which tensor is returned.
388388
*/
389389

390-
RedisAI_DataFmt ParseTensorGetArgs(RedisModuleCtx *ctx, RedisModuleString **argv, int argc);
390+
RedisAI_TensorFmt ParseTensorGetArgs(RedisModuleCtx *ctx, RedisModuleString **argv, int argc);
391391

392392
/**
393393
* Helper method to return a tensor to the client in a response to AI.TENSORGET
@@ -399,7 +399,7 @@ RedisAI_DataFmt ParseTensorGetArgs(RedisModuleCtx *ctx, RedisModuleString **argv
399399
* @return REDISMODULE_OK in case of success, REDISMODULE_ERR otherwise.
400400
*/
401401

402-
int ReplyWithTensor(RedisModuleCtx *ctx, RedisAI_DataFmt fmt, RAI_Tensor *t);
402+
int ReplyWithTensor(RedisModuleCtx *ctx, RedisAI_TensorFmt fmt, RAI_Tensor *t);
403403

404404
/**
405405
* @brief Returns the redis module type representing a tensor.

0 commit comments

Comments
 (0)