From f78b06729430684c08861bd34332a4237a13d40b Mon Sep 17 00:00:00 2001 From: DvirDukhan Date: Wed, 10 Feb 2021 12:52:56 +0200 Subject: [PATCH 1/4] lite & rce --- opt/Makefile | 6 +++++- opt/pack.sh | 12 +++++++++--- ramp-lite.yml | 38 ++++++++++++++++++++++++++++++++++++++ ramp-rce.yml | 27 +++++++++++++++++++++++++++ ramp.yml | 2 -- 5 files changed, 79 insertions(+), 6 deletions(-) create mode 100644 ramp-lite.yml create mode 100644 ramp-rce.yml diff --git a/opt/Makefile b/opt/Makefile index 272173c0c..1fbc8d908 100755 --- a/opt/Makefile +++ b/opt/Makefile @@ -219,9 +219,13 @@ 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 + $(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=0 DEPS=1 ./pack.sh + $(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 DEPS=1 VARIANT=lite ./pack.sh + $(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 DEPS=1 VARIANT=rce ./pack.sh else $(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 DEPS=0 ./pack.sh + $(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 DEPS=0 VARIANT=lite ./pack.sh + $(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 DEPS=0 VARIANT=rce ./pack.sh endif #---------------------------------------------------------------------------------------------- diff --git a/opt/pack.sh b/opt/pack.sh index 27022c7a3..759696ee6 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 From 2dd36fddc63fef07d6adc77d9dfb2593bc0b848d Mon Sep 17 00:00:00 2001 From: DvirDukhan Date: Thu, 11 Mar 2021 12:53:29 +0200 Subject: [PATCH 2/4] fixed PR comment --- opt/pack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opt/pack.sh b/opt/pack.sh index 759696ee6..3807ef037 100755 --- a/opt/pack.sh +++ b/opt/pack.sh @@ -104,7 +104,7 @@ pack_ramp() { if [[ -z $VARIANT ]]; then local rampfile=ramp.yml else - local rampfile=ramp$VARIANT.yml + local rampfile=ramp${VARIANT}.yml fi python3 $READIES/xtx \ From 846fbe35a9a79feb2eafa76311d3b427b075dfc9 Mon Sep 17 00:00:00 2001 From: DvirDukhan Date: Thu, 11 Mar 2021 14:23:52 +0200 Subject: [PATCH 3/4] fixed PR comments --- opt/Makefile | 13 ++++++------- opt/pack.sh | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/opt/Makefile b/opt/Makefile index 857182331..a909343c0 100755 --- a/opt/Makefile +++ b/opt/Makefile @@ -218,15 +218,14 @@ lint-docker: 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=0 DEPS=1 ./pack.sh - $(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 DEPS=1 VARIANT=lite ./pack.sh - $(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 DEPS=1 VARIANT=rce ./pack.sh -else - $(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 DEPS=0 ./pack.sh - $(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 DEPS=0 VARIANT=lite ./pack.sh - $(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 DEPS=0 VARIANT=rce ./pack.sh +override PACK_DEPS:=1 endif +DEPS=$(PACK_DEPS) +$(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 ./pack.sh +$(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 VARIANT=lite ./pack.sh +$(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 VARIANT=rce ./pack.sh #---------------------------------------------------------------------------------------------- diff --git a/opt/pack.sh b/opt/pack.sh index 3807ef037..6a1224f22 100755 --- a/opt/pack.sh +++ b/opt/pack.sh @@ -104,7 +104,7 @@ pack_ramp() { if [[ -z $VARIANT ]]; then local rampfile=ramp.yml else - local rampfile=ramp${VARIANT}.yml + local rampfile=ramp-${VARIANT}.yml fi python3 $READIES/xtx \ From b36bdf3bb9d3730e51253171bafef583f461542e Mon Sep 17 00:00:00 2001 From: DvirDukhan Date: Thu, 11 Mar 2021 22:28:11 +0200 Subject: [PATCH 4/4] fixed PR comment --- opt/Makefile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/opt/Makefile b/opt/Makefile index a909343c0..8d9d29071 100755 --- a/opt/Makefile +++ b/opt/Makefile @@ -215,17 +215,16 @@ lint-docker: #---------------------------------------------------------------------------------------------- -pack: $(INSTALLED_TARGET) - $(SHOW)find $(INSTALL_DIR) -name "*.so" -exec chmod +x {} \; - $(SHOW)mkdir -p $(ROOT)/bin/artifacts - ifneq ($(PACK_DEPS),0) override PACK_DEPS:=1 endif -DEPS=$(PACK_DEPS) -$(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 ./pack.sh -$(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 VARIANT=lite ./pack.sh -$(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 VARIANT=rce ./pack.sh + +pack: $(INSTALLED_TARGET) + $(SHOW)find $(INSTALL_DIR) -name "*.so" -exec chmod +x {} \; + $(SHOW)mkdir -p $(ROOT)/bin/artifacts + $(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 #----------------------------------------------------------------------------------------------