diff --git a/opt/Makefile b/opt/Makefile index 5d5fcaa06..8d9d29071 100755 --- a/opt/Makefile +++ b/opt/Makefile @@ -215,14 +215,16 @@ lint-docker: #---------------------------------------------------------------------------------------------- +ifneq ($(PACK_DEPS),0) +override PACK_DEPS:=1 +endif + pack: $(INSTALLED_TARGET) $(SHOW)find $(INSTALL_DIR) -name "*.so" -exec chmod +x {} \; $(SHOW)mkdir -p $(ROOT)/bin/artifacts -ifneq ($(PACK_DEPS),0) - $(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 DEPS=1 ./pack.sh -else - $(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 DEPS=0 ./pack.sh -endif + $(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) DEPS=$(PACK_DEPS) ./pack.sh + $(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) DEPS=$(PACK_DEPS) VARIANT=lite ./pack.sh + $(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) DEPS=$(PACK_DEPS) VARIANT=rce ./pack.sh #---------------------------------------------------------------------------------------------- diff --git a/opt/pack.sh b/opt/pack.sh index 27022c7a3..6a1224f22 100755 --- a/opt/pack.sh +++ b/opt/pack.sh @@ -100,11 +100,17 @@ pack_ramp() { xtx_vars+=" -e NAME_$dep -e PATH_$dep -e SHA256_$dep" done - + + if [[ -z $VARIANT ]]; then + local rampfile=ramp.yml + else + local rampfile=ramp-${VARIANT}.yml + fi + python3 $READIES/xtx \ $xtx_vars \ -e DEVICE -e NUMVER -e SEMVER \ - $ROOT/ramp.yml > /tmp/ramp.yml + $ROOT/$rampfile > /tmp/ramp.yml rm -f /tmp/ramp.fname $packfile $RAMP_PROG pack -m /tmp/ramp.yml --packname-file /tmp/ramp.fname --verbose --debug -o $packfile $product_so >/tmp/ramp.err 2>&1 || true if [[ ! -e $packfile ]]; then @@ -179,7 +185,7 @@ if [[ $RAMP == 1 ]]; then exit 1 fi - echo "Building RAMP files ..." + echo "Building RAMP $VARIANT files ..." SNAPSHOT=0 pack_ramp SNAPSHOT=1 pack_ramp echo "Done." diff --git a/ramp-lite.yml b/ramp-lite.yml new file mode 100644 index 000000000..53ea75607 --- /dev/null +++ b/ramp-lite.yml @@ -0,0 +1,38 @@ +display_name: RedisAI +author: Tensorwerk and RedisLabs +email: support@redislabs.com +description: Serving tensors and executing deep learning graphs +homepage: https://oss.redislabs.com/redisai/ +license: Redis Source Available License v1.0 +command_line_args: "BACKENDSPATH /var/opt/redislabs/modules/ai/{{NUMVER}}/deps" +# command_line_args: "BACKENDSPATH /var/opt/redislabs/modules/ai/{{NUMVER}}/deps/backends" +min_redis_version: "5.0.7" +min_redis_pack_version: "5.4.14" +capabilities: + - types + - hash_policy + - eviction_expiry + - failover_migrate + - persistence_rdb + - persistence_aof + - clustering + - backup_restore + - replica_of + - flash + - resharding +dependencies: + {{NAME_tensorflow}}: + url: http://redismodules.s3.amazonaws.com/redisai/{{PATH_tensorflow}} + sha256: {{SHA256_tensorflow}} + {{NAME_torch}}: + url: http://redismodules.s3.amazonaws.com/redisai/{{PATH_torch}} + sha256: {{SHA256_torch}} + {{NAME_onnxruntime}}: + url: http://redismodules.s3.amazonaws.com/redisai/{{PATH_onnxruntime}} + sha256: {{SHA256_onnxruntime}} + {{NAME_tflite}}: + url: http://redismodules.s3.amazonaws.com/redisai/{{PATH_tflite}} + sha256: {{SHA256_tflite}} +# {{NAME_all}}: +# url: http://redismodules.s3.amazonaws.com/redisai/{{PATH_all}} +# sha256: {{SHA256_all}} diff --git a/ramp-rce.yml b/ramp-rce.yml new file mode 100644 index 000000000..c1e724fe6 --- /dev/null +++ b/ramp-rce.yml @@ -0,0 +1,27 @@ +display_name: RedisAI +author: Tensorwerk and RedisLabs +email: support@redislabs.com +description: Serving tensors and executing deep learning graphs +homepage: https://oss.redislabs.com/redisai/ +license: Redis Source Available License v1.0 +command_line_args: "BACKENDSPATH /var/opt/redislabs/modules/ai/{{NUMVER}}/deps" +# command_line_args: "BACKENDSPATH /var/opt/redislabs/modules/ai/{{NUMVER}}/deps/backends" +min_redis_version: "5.0.7" +min_redis_pack_version: "5.4.14" +capabilities: + - types + - hash_policy + - eviction_expiry + - failover_migrate + - persistence_rdb + - persistence_aof + - clustering + - backup_restore + - replica_of + - flash + - resharding +dependencies: + {{NAME_onnxruntime}}: + url: http://redismodules.s3.amazonaws.com/redisai/{{PATH_onnxruntime}} + sha256: {{SHA256_onnxruntime}} + diff --git a/ramp.yml b/ramp.yml index ed57e479a..eaa491998 100644 --- a/ramp.yml +++ b/ramp.yml @@ -17,8 +17,6 @@ capabilities: - persistence_aof - clustering - backup_restore - - replica_of - - flash exclude_commands: - ai.modelset - ai.modeldel