Skip to content

Commit 2522ca7

Browse files
committed
DL to AI name change
1 parent a77d05f commit 2522ca7

File tree

18 files changed

+372
-439
lines changed

18 files changed

+372
-439
lines changed

README.md

Lines changed: 0 additions & 67 deletions
This file was deleted.

examples/js/mobilenet.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ async function run(filenames) {
4949
const buffer = fs.readFileSync(graph_filename, {'flag': 'r'});
5050

5151
console.log("Setting graph");
52-
redis.call('DL.SET', 'GRAPH', 'mobilenet', 'TF', buffer);
52+
redis.call('AI.SET', 'GRAPH', 'mobilenet', 'TF', buffer);
5353

5454
const image_height = 224;
5555
const image_width = 224;
@@ -65,15 +65,15 @@ async function run(filenames) {
6565
let buffer = Buffer.from(normalized.buffer);
6666

6767
console.log("Setting input tensor");
68-
redis.call('DL.SET', 'TENSOR', 'input_' + i,
68+
redis.call('AI.SET', 'TENSOR', 'input_' + i,
6969
'FLOAT', 4, 1, image_width, image_height, 3,
7070
'BLOB', buffer);
7171

7272
console.log("Running graph");
73-
redis.call('DL.RUN', 'GRAPH', 'mobilenet', 1, 'input_' + i, input_var, 'output_' + i, output_var);
73+
redis.call('AI.RUN', 'GRAPH', 'mobilenet', 1, 'input_' + i, input_var, 'output_' + i, output_var);
7474

7575
console.log("Getting output tensor");
76-
let out_data = await redis.callBuffer('DL.GET', 'TENSOR', 'output_' + i, 'BLOB');
76+
let out_data = await redis.callBuffer('AI.GET', 'TENSOR', 'output_' + i, 'BLOB');
7777
let out_array = buffer_to_float32array(out_data[4]);
7878

7979
label = argmax(out_array);

examples/models/load_model.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
REDIS_CLI=../../deps/redis/src/redis-cli
22

33
echo "SET GRAPH"
4-
$REDIS_CLI -x DL.SET GRAPH foo TF < graph.pb
4+
$REDIS_CLI -x AI.SET GRAPH foo TF < graph.pb
55

66
echo "SET TENSORS"
7-
$REDIS_CLI DL.SET TENSOR a FLOAT 1 2 VALUES 2 3
8-
$REDIS_CLI DL.SET TENSOR b FLOAT 1 2 VALUES 2 3
7+
$REDIS_CLI AI.SET TENSOR a FLOAT 1 2 VALUES 2 3
8+
$REDIS_CLI AI.SET TENSOR b FLOAT 1 2 VALUES 2 3
99

1010
echo "GET TENSORS"
11-
$REDIS_CLI DL.GET TENSOR a VALUES
12-
$REDIS_CLI DL.GET TENSOR b VALUES
11+
$REDIS_CLI AI.GET TENSOR a VALUES
12+
$REDIS_CLI AI.GET TENSOR b VALUES
1313

1414
echo "RUN GRAPH"
15-
$REDIS_CLI DL.RUN GRAPH foo 2 a a b b c mul
15+
$REDIS_CLI AI.RUN GRAPH foo 2 a a b b c mul
1616

1717
echo "GET TENSOR META"
18-
$REDIS_CLI DL.GET TENSOR c META
18+
$REDIS_CLI AI.GET TENSOR c META
1919

2020
echo "GET TENSOR VALUES"
21-
$REDIS_CLI DL.GET TENSOR c VALUES
21+
$REDIS_CLI AI.GET TENSOR c VALUES
2222

2323
echo "GET TENSOR BLOB"
24-
#$REDIS_CLI --raw DL.GET TENSOR c BLOB
25-
$REDIS_CLI DL.GET TENSOR c BLOB
24+
#$REDIS_CLI --raw AI.GET TENSOR c BLOB
25+
$REDIS_CLI AI.GET TENSOR c BLOB
2626

examples/models/load_yolo.sh

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,35 @@ IMAGE_WIDTH=224
1313
IMAGE_HEIGHT=224
1414

1515
echo "SET GRAPH"
16-
$REDIS_CLI -x DL.SET GRAPH $GRAPH_KEY TF < $GRAPH_FILE
16+
$REDIS_CLI -x AI.SET GRAPH $GRAPH_KEY TF < $GRAPH_FILE
1717

1818
# TODO: cast tensor, change shape of tensor (NHWC, NCHW)
1919
# instead of casting, we could specify the type of data provided in the blob
2020
# after the BLOB keyword
2121
# Preprocess: resizes the $INPUT_KEY to cfg size, scales 0-255 to 0-1, and throws away alpha channel
22-
# Not clear why DL doesn't complain when we feed a random $INPUT_KEY
22+
# Not clear why AI doesn't complain when we feed a random $INPUT_KEY
2323
echo "SET TENSOR"
24-
$REDIS_CLI -x DL.SET TENSOR $INPUT_KEY FLOAT 4 1 $IMAGE_WIDTH $IMAGE_HEIGHT 3 BLOB < $IMAGE_FILE
24+
$REDIS_CLI -x AI.SET TENSOR $INPUT_KEY FLOAT 4 1 $IMAGE_WIDTH $IMAGE_HEIGHT 3 BLOB < $IMAGE_FILE
2525

2626
echo "GET TENSOR"
27-
$REDIS_CLI DL.GET TENSOR $INPUT_KEY META
27+
$REDIS_CLI AI.GET TENSOR $INPUT_KEY META
2828

2929
echo "RUN GRAPH"
30-
$REDIS_CLI DL.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
31-
$REDIS_CLI DL.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
32-
$REDIS_CLI DL.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
33-
$REDIS_CLI DL.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
34-
$REDIS_CLI DL.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
35-
$REDIS_CLI DL.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
36-
$REDIS_CLI DL.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
37-
$REDIS_CLI DL.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
38-
$REDIS_CLI DL.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
39-
$REDIS_CLI DL.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
40-
$REDIS_CLI DL.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
41-
$REDIS_CLI DL.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
42-
$REDIS_CLI DL.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
43-
$REDIS_CLI DL.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
30+
$REDIS_CLI AI.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
31+
$REDIS_CLI AI.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
32+
$REDIS_CLI AI.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
33+
$REDIS_CLI AI.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
34+
$REDIS_CLI AI.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
35+
$REDIS_CLI AI.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
36+
$REDIS_CLI AI.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
37+
$REDIS_CLI AI.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
38+
$REDIS_CLI AI.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
39+
$REDIS_CLI AI.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
40+
$REDIS_CLI AI.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
41+
$REDIS_CLI AI.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
42+
$REDIS_CLI AI.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
43+
$REDIS_CLI AI.RUN GRAPH $GRAPH_KEY 1 $INPUT_KEY $INPUT_VAR $OUTPUT_KEY $OUTPUT_VAR
4444

4545
echo "GET OUTPUT TENSOR"
46-
$REDIS_CLI DL.GET TENSOR $OUTPUT_KEY META
46+
$REDIS_CLI AI.GET TENSOR $OUTPUT_KEY META
4747

src/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ DEPS_PATH=../deps
99
INSTALL_PATH=../install/
1010
INSTALL=install
1111

12-
TS_OBJ = redisdl.o tensor.o graph.o
12+
TS_OBJ = redisai.o tensor.o graph.o
1313

1414
INCLUDE_FLAGS=-I $(DEPS_PATH)/redis/src \
1515
-I $(DEPS_PATH)/dlpack/include \
@@ -31,13 +31,13 @@ INCLUDE_FLAGS += -I $(DEPS_PATH)/libtensorflow/include
3131
LDPATH_FLAGS += -L $(DEPS_PATH)/libtensorflow/lib
3232
BACKEND_INSTALL += $(INSTALL) $(DEPS_PATH)/libtensorflow/lib/libtensorflow*.so $(INSTALL_PATH)
3333

34-
all: redisdl.so
34+
all: redisai.so
3535

3636
%.o: %.c
3737
$(TS_CC) $(INCLUDE_FLAGS) -c $(FINAL_CFLAGS) $<
3838

39-
redisdl.so: $(TS_OBJ)
40-
$(TS_LD) $(LDPATH_FLAGS) $(FINAL_LDFLAGS) -o redisdl.so $(TS_OBJ)
39+
redisai.so: $(TS_OBJ)
40+
$(TS_LD) $(LDPATH_FLAGS) $(FINAL_LDFLAGS) -o redisai.so $(TS_OBJ)
4141

4242
clean:
4343
rm *.o *.so
@@ -50,9 +50,9 @@ cleandeps: clean
5050

5151
install: all
5252
@mkdir -p $(INSTALL_PATH)
53-
$(INSTALL) redisdl.so $(INSTALL_PATH)
53+
$(INSTALL) redisai.so $(INSTALL_PATH)
5454
$(INSTALL) $(DEPS_PATH)/redis/src/redis-server $(INSTALL_PATH)
5555
$(BACKEND_INSTALL)
5656

5757
run: install
58-
$(FINAL_LDPATH) $(INSTALL_PATH)/redis-server --loadmodule $(INSTALL_PATH)/redisdl.so
58+
$(FINAL_LDPATH) $(INSTALL_PATH)/redis-server --loadmodule $(INSTALL_PATH)/redisai.so

src/backends_tensorflow.c

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "tensor.h"
33
#include "utils/arr_rm_alloc.h"
44

5-
TF_DataType RDL_GetTFDataTypeFromDL(DLDataType dtype) {
5+
TF_DataType RAI_GetTFDataTypeFromDL(DLDataType dtype) {
66

77
if (dtype.code == kDLFloat) {
88
switch (dtype.bits) {
@@ -41,7 +41,7 @@ TF_DataType RDL_GetTFDataTypeFromDL(DLDataType dtype) {
4141
return 0;
4242
}
4343

44-
DLDataType RDL_GetDLDataTypeFromTF(TF_DataType dtype) {
44+
DLDataType RAI_GetDLDataTypeFromTF(TF_DataType dtype) {
4545
switch (dtype) {
4646
case TF_FLOAT:
4747
return (DLDataType){ .code = kDLFloat, .bits = 32, .lanes = 1 };
@@ -65,8 +65,8 @@ DLDataType RDL_GetDLDataTypeFromTF(TF_DataType dtype) {
6565
return (DLDataType){ .bits = 0 };
6666
}
6767

68-
RDL_Tensor* RDL_TensorCreateFromTFTensor(TF_Tensor *tensor) {
69-
RDL_Tensor* ret = RedisModule_Alloc(sizeof(*ret));
68+
RAI_Tensor* RAI_TensorCreateFromTFTensor(TF_Tensor *tensor) {
69+
RAI_Tensor* ret = RedisModule_Alloc(sizeof(*ret));
7070

7171
DLContext ctx = (DLContext){
7272
.device_type = kDLCPU,
@@ -85,21 +85,21 @@ RDL_Tensor* RDL_TensorCreateFromTFTensor(TF_Tensor *tensor) {
8585
// Redis be responsible for the memory, or we reuse the TF
8686
// allocated memory, which might not be optimal down the road
8787
// Note: on YOLO this has no impact on perf
88-
#ifdef RDL_COPY_RUN_OUTPUT
88+
#ifdef RAI_COPY_RUN_OUTPUT
8989
size_t len = TF_TensorByteSize(tensor);
9090
char* data = RedisModule_Alloc(len * sizeof(*data));
9191
memcpy(data, TF_TensorData(tensor), len);
9292
#endif
9393

9494
ret->tensor = (DLTensor){
9595
.ctx = ctx,
96-
#ifdef RDL_COPY_RUN_OUTPUT
96+
#ifdef RAI_COPY_RUN_OUTPUT
9797
.data = data,
9898
#else
9999
.data = TF_TensorData(tensor),
100100
#endif
101101
.ndim = ndims,
102-
.dtype = RDL_GetDLDataTypeFromTF(TF_TensorType(tensor)),
102+
.dtype = RAI_GetDLDataTypeFromTF(TF_TensorType(tensor)),
103103
.shape = shape,
104104
.strides = NULL,
105105
.byte_offset = 0
@@ -109,34 +109,34 @@ RDL_Tensor* RDL_TensorCreateFromTFTensor(TF_Tensor *tensor) {
109109
return ret;
110110
}
111111

112-
void RDL_TFDeallocator(void* data, size_t len, void* arg) {
112+
void RAI_TFDeallocator(void* data, size_t len, void* arg) {
113113
// printf("DEALLOCATOR CALLED\n");
114114
// do nothing, memory is managed by Redis
115115
}
116116

117-
TF_Tensor* RDL_TFTensorFromTensor(RDL_Tensor* t){
118-
#ifdef RDL_COPY_RUN_INPUT
117+
TF_Tensor* RAI_TFTensorFromTensor(RAI_Tensor* t){
118+
#ifdef RAI_COPY_RUN_INPUT
119119
TF_Tensor* out = TF_AllocateTensor(
120-
RDL_GetTFDataTypeFromDL(t->tensor.dtype),
120+
RAI_GetTFDataTypeFromDL(t->tensor.dtype),
121121
t->tensor.shape,
122122
t->tensor.ndim,
123-
RDL_TensorByteSize(t));
123+
RAI_TensorByteSize(t));
124124
memcpy(TF_TensorData(out), t->tensor.data, TF_TensorByteSize(out));
125125
return out;
126126
#else
127127
return TF_NewTensor(
128-
RDL_GetTFDataTypeFromDL(t->tensor.dtype),
128+
RAI_GetTFDataTypeFromDL(t->tensor.dtype),
129129
t->tensor.shape,
130130
t->tensor.ndim,
131131
t->tensor.data,
132-
RDL_TensorByteSize(t),
133-
&RDL_TFDeallocator,
132+
RAI_TensorByteSize(t),
133+
&RAI_TFDeallocator,
134134
NULL);
135-
#endif /* RDL_COPY_RUN_INPUT */
135+
#endif /* RAI_COPY_RUN_INPUT */
136136
}
137137

138138

139-
RDL_Graph *RDL_GraphCreateTF(const char *prefix, RDL_Backend backend,
139+
RAI_Graph *RAI_GraphCreateTF(const char *prefix, RAI_Backend backend,
140140
const char *graphdef, size_t graphlen) {
141141
TF_Graph* graph = TF_NewGraph();
142142

@@ -173,7 +173,7 @@ RDL_Graph *RDL_GraphCreateTF(const char *prefix, RDL_Backend backend,
173173
TF_DeleteSessionOptions(sessionOptions);
174174
TF_DeleteStatus(sessionStatus);
175175

176-
RDL_Graph* ret = RedisModule_Alloc(sizeof(*ret));
176+
RAI_Graph* ret = RedisModule_Alloc(sizeof(*ret));
177177
ret->graph = graph;
178178
ret->session = session;
179179
ret->backend = backend;
@@ -182,7 +182,7 @@ RDL_Graph *RDL_GraphCreateTF(const char *prefix, RDL_Backend backend,
182182
return ret;
183183
}
184184

185-
void RDL_GraphFreeTF(RDL_Graph* graph) {
185+
void RAI_GraphFreeTF(RAI_Graph* graph) {
186186
TF_Status *status = TF_NewStatus();
187187
TF_CloseSession(graph->session, status);
188188

@@ -207,7 +207,7 @@ void RDL_GraphFreeTF(RDL_Graph* graph) {
207207
TF_DeleteStatus(status);
208208
}
209209

210-
int RDL_GraphRunTF(RDL_GraphRunCtx* gctx) {
210+
int RAI_GraphRunTF(RAI_GraphRunCtx* gctx) {
211211
TF_Status *status = TF_NewStatus();
212212

213213
TF_Tensor* inputTensorsValues[array_len(gctx->inputs)];
@@ -216,7 +216,7 @@ int RDL_GraphRunTF(RDL_GraphRunCtx* gctx) {
216216
TF_Output outputs[array_len(gctx->outputs)];
217217

218218
for (size_t i = 0 ; i < array_len(gctx->inputs); ++i) {
219-
inputTensorsValues[i] = RDL_TFTensorFromTensor(gctx->inputs[i].tensor);
219+
inputTensorsValues[i] = RAI_TFTensorFromTensor(gctx->inputs[i].tensor);
220220
TF_Output port;
221221
port.oper = TF_GraphOperationByName(gctx->graph->graph, gctx->inputs[i].name);
222222
port.index = 0;
@@ -249,8 +249,8 @@ int RDL_GraphRunTF(RDL_GraphRunCtx* gctx) {
249249
}
250250

251251
for(size_t i = 0 ; i < array_len(gctx->outputs) ; ++i) {
252-
RDL_Tensor* output_tensor = RDL_TensorCreateFromTFTensor(outputTensorsValues[i]);
253-
gctx->outputs[i].tensor = RDL_TensorGetShallowCopy(output_tensor);
252+
RAI_Tensor* output_tensor = RAI_TensorCreateFromTFTensor(outputTensorsValues[i]);
253+
gctx->outputs[i].tensor = RAI_TensorGetShallowCopy(output_tensor);
254254
}
255255

256256
TF_DeleteStatus(status);

src/backends_tensorflow.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
#include "tensorflow/c/c_api.h"
99

10-
RDL_Tensor* RDL_TensorCreateFromTFTensor(TF_Tensor *tensor);
10+
RAI_Tensor* RAI_TensorCreateFromTFTensor(TF_Tensor *tensor);
1111

12-
TF_Tensor* RDL_TFTensorFromTensor(RDL_Tensor* t);
12+
TF_Tensor* RAI_TFTensorFromTensor(RAI_Tensor* t);
1313

14-
RDL_Graph *RDL_GraphCreateTF(const char *prefix, RDL_Backend backend,
14+
RAI_Graph *RAI_GraphCreateTF(const char *prefix, RAI_Backend backend,
1515
const char *graphdef, size_t graphlen);
1616

17-
void RDL_GraphFreeTF(RDL_Graph* graph);
17+
void RAI_GraphFreeTF(RAI_Graph* graph);
1818

19-
int RDL_GraphRunTF(RDL_GraphRunCtx* gctx);
19+
int RAI_GraphRunTF(RAI_GraphRunCtx* gctx);
2020

21-
#endif /* SRC_BACKENDS_TENSORFLOW_H_ */
21+
#endif /* SRC_BACKENDS_TENSORFLOW_H_ */

0 commit comments

Comments
 (0)