Skip to content

Commit f1a0530

Browse files
author
DvirDukhan
authored
Merge pull request #603 from RedisAI/lite
lite & rce
2 parents 353c7c2 + 43b0fb2 commit f1a0530

File tree

5 files changed

+81
-10
lines changed

5 files changed

+81
-10
lines changed

opt/Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,14 +215,16 @@ lint-docker:
215215

216216
#----------------------------------------------------------------------------------------------
217217

218+
ifneq ($(PACK_DEPS),0)
219+
override PACK_DEPS:=1
220+
endif
221+
218222
pack: $(INSTALLED_TARGET)
219223
$(SHOW)find $(INSTALL_DIR) -name "*.so" -exec chmod +x {} \;
220224
$(SHOW)mkdir -p $(ROOT)/bin/artifacts
221-
ifneq ($(PACK_DEPS),0)
222-
$(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 DEPS=1 ./pack.sh
223-
else
224-
$(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 DEPS=0 ./pack.sh
225-
endif
225+
$(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) DEPS=$(PACK_DEPS) ./pack.sh
226+
$(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) DEPS=$(PACK_DEPS) VARIANT=lite ./pack.sh
227+
$(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) DEPS=$(PACK_DEPS) VARIANT=rce ./pack.sh
226228

227229
#----------------------------------------------------------------------------------------------
228230

opt/pack.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,17 @@ pack_ramp() {
100100

101101
xtx_vars+=" -e NAME_$dep -e PATH_$dep -e SHA256_$dep"
102102
done
103-
103+
104+
if [[ -z $VARIANT ]]; then
105+
local rampfile=ramp.yml
106+
else
107+
local rampfile=ramp-${VARIANT}.yml
108+
fi
109+
104110
python3 $READIES/xtx \
105111
$xtx_vars \
106112
-e DEVICE -e NUMVER -e SEMVER \
107-
$ROOT/ramp.yml > /tmp/ramp.yml
113+
$ROOT/$rampfile > /tmp/ramp.yml
108114
rm -f /tmp/ramp.fname $packfile
109115
$RAMP_PROG pack -m /tmp/ramp.yml --packname-file /tmp/ramp.fname --verbose --debug -o $packfile $product_so >/tmp/ramp.err 2>&1 || true
110116
if [[ ! -e $packfile ]]; then
@@ -179,7 +185,7 @@ if [[ $RAMP == 1 ]]; then
179185
exit 1
180186
fi
181187

182-
echo "Building RAMP files ..."
188+
echo "Building RAMP $VARIANT files ..."
183189
SNAPSHOT=0 pack_ramp
184190
SNAPSHOT=1 pack_ramp
185191
echo "Done."

ramp-lite.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
display_name: RedisAI
2+
author: Tensorwerk and RedisLabs
3+
email: support@redislabs.com
4+
description: Serving tensors and executing deep learning graphs
5+
homepage: https://oss.redislabs.com/redisai/
6+
license: Redis Source Available License v1.0
7+
command_line_args: "BACKENDSPATH /var/opt/redislabs/modules/ai/{{NUMVER}}/deps"
8+
# command_line_args: "BACKENDSPATH /var/opt/redislabs/modules/ai/{{NUMVER}}/deps/backends"
9+
min_redis_version: "5.0.7"
10+
min_redis_pack_version: "5.4.14"
11+
capabilities:
12+
- types
13+
- hash_policy
14+
- eviction_expiry
15+
- failover_migrate
16+
- persistence_rdb
17+
- persistence_aof
18+
- clustering
19+
- backup_restore
20+
- replica_of
21+
- flash
22+
- resharding
23+
dependencies:
24+
{{NAME_tensorflow}}:
25+
url: http://redismodules.s3.amazonaws.com/redisai/{{PATH_tensorflow}}
26+
sha256: {{SHA256_tensorflow}}
27+
{{NAME_torch}}:
28+
url: http://redismodules.s3.amazonaws.com/redisai/{{PATH_torch}}
29+
sha256: {{SHA256_torch}}
30+
{{NAME_onnxruntime}}:
31+
url: http://redismodules.s3.amazonaws.com/redisai/{{PATH_onnxruntime}}
32+
sha256: {{SHA256_onnxruntime}}
33+
{{NAME_tflite}}:
34+
url: http://redismodules.s3.amazonaws.com/redisai/{{PATH_tflite}}
35+
sha256: {{SHA256_tflite}}
36+
# {{NAME_all}}:
37+
# url: http://redismodules.s3.amazonaws.com/redisai/{{PATH_all}}
38+
# sha256: {{SHA256_all}}

ramp-rce.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
display_name: RedisAI
2+
author: Tensorwerk and RedisLabs
3+
email: support@redislabs.com
4+
description: Serving tensors and executing deep learning graphs
5+
homepage: https://oss.redislabs.com/redisai/
6+
license: Redis Source Available License v1.0
7+
command_line_args: "BACKENDSPATH /var/opt/redislabs/modules/ai/{{NUMVER}}/deps"
8+
# command_line_args: "BACKENDSPATH /var/opt/redislabs/modules/ai/{{NUMVER}}/deps/backends"
9+
min_redis_version: "5.0.7"
10+
min_redis_pack_version: "5.4.14"
11+
capabilities:
12+
- types
13+
- hash_policy
14+
- eviction_expiry
15+
- failover_migrate
16+
- persistence_rdb
17+
- persistence_aof
18+
- clustering
19+
- backup_restore
20+
- replica_of
21+
- flash
22+
- resharding
23+
dependencies:
24+
{{NAME_onnxruntime}}:
25+
url: http://redismodules.s3.amazonaws.com/redisai/{{PATH_onnxruntime}}
26+
sha256: {{SHA256_onnxruntime}}
27+

ramp.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ capabilities:
1717
- persistence_aof
1818
- clustering
1919
- backup_restore
20-
- replica_of
21-
- flash
2220
exclude_commands:
2321
- ai.modelset
2422
- ai.modeldel

0 commit comments

Comments
 (0)