From 64eabbcad6de69e1bf88147f982a5df67bde587b Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Sun, 21 Mar 2021 17:25:28 +0200 Subject: [PATCH 1/4] restore ramp --- opt/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/opt/Makefile b/opt/Makefile index 8d9d29071..53f0e42d7 100755 --- a/opt/Makefile +++ b/opt/Makefile @@ -36,7 +36,7 @@ make build # compile and link PROFILE=1 # enable profiling compile flags (and debug symbols) for release type. # You can consider this as build type release with debug symbols and -fno-omit-frame-pointer VARIANT=name # build variant `name` - WHY=1 # explain CMake decisions (into /tmp/cmake.why) + WHY=1 # explain CMake decisions (into /tmp/cmake.why) make clean # remove build artifacts ALL=1 # remove entire artifacts directory make install # create ready-to-run scheme (module and engines) @@ -79,7 +79,7 @@ device selection options (fetch, build, and test): JETSON=1 # build for Nvidia Jetson endef -#---------------------------------------------------------------------------------------------- +#---------------------------------------------------------------------------------------------- override GPU:=$(or $(findstring $(CUDA),1),$(findstring $(GPU),1)) @@ -97,7 +97,7 @@ DEPS_FLAGS += CPU=1 DEVICE=cpu endif -#---------------------------------------------------------------------------------------------- +#---------------------------------------------------------------------------------------------- SRCDIR=.. BINDIR=$(BINROOT)/src @@ -110,7 +110,7 @@ INSTALLED_TARGET=$(INSTALL_DIR)/redisai.so BACKENDS_PATH ?= $(INSTALL_DIR)/backends -#---------------------------------------------------------------------------------------------- +#---------------------------------------------------------------------------------------------- CMAKE_FILES += \ $(SRCDIR)/CMakeLists.txt \ @@ -165,7 +165,7 @@ include $(MK)/defs include $(MK)/rules -#---------------------------------------------------------------------------------------------- +#---------------------------------------------------------------------------------------------- #prebuild: # $(SHOW)if [ ! -d $(DEPS_DIR) ]; then echo $$'Dependencies are not in place.\nPlease run \'make fetch\'.'; exit 1; fi @@ -190,7 +190,7 @@ else -$(SHOW)$(MAKE) -C $(BINDIR) clean endif -#---------------------------------------------------------------------------------------------- +#---------------------------------------------------------------------------------------------- setup: @echo Setting up system... @@ -222,9 +222,9 @@ endif 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 + $(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 DEPS=$(PACK_DEPS) ./pack.sh + $(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 DEPS=$(PACK_DEPS) VARIANT=lite ./pack.sh + $(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 DEPS=$(PACK_DEPS) VARIANT=rce ./pack.sh #---------------------------------------------------------------------------------------------- From 499596e44c7805d9cd852d0858eeb8be4dab5cbb Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Sun, 21 Mar 2021 17:27:59 +0200 Subject: [PATCH 2/4] on any branch [DEBUG ONLY] remove prior to merge --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f418f7398..3229da8a1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -442,7 +442,7 @@ after-platform-builds: &after-platform-builds platform-build-defs: &platform-build-defs <<: *after-build-and-test - <<: *on-integ-and-version-tags + <<: *on-any-branch # <<: *on-any-branch # debugging @@ -488,7 +488,7 @@ workflows: - deploy-snapshot: context: common <<: *after-platform-builds - <<: *on-integ-branch + <<: *on-any-branch - deploy-release: context: common <<: *after-platform-builds From dfb1a19856ce34b4a53598c0fa6334c3dfe943c0 Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Sun, 21 Mar 2021 18:17:38 +0200 Subject: [PATCH 3/4] fixing pack script VARIANT pass --- opt/pack.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/opt/pack.sh b/opt/pack.sh index 6a1224f22..0d85ed96a 100755 --- a/opt/pack.sh +++ b/opt/pack.sh @@ -14,7 +14,7 @@ fi if [[ $1 == --help || $1 == help ]]; then cat <<-END pack.sh [cpu|gpu] [--help|help] - + Argument variables: DEVICE=cpu|gpu CPU or GPU variants RAMP=1 Build RAMP file @@ -81,7 +81,7 @@ pack_ramp() { local packdir=snapshots local s3base=snapshots/ fi - + local fq_package=$stem.${verspec}.zip [[ ! -d $BINDIR/$packdir ]] && mkdir -p $BINDIR/$packdir @@ -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 \ @@ -124,7 +124,7 @@ pack_ramp() { pack_deps() { local depname="$1" - + cd $ROOT local platform="$OS-$OSNICK-$ARCH" @@ -132,13 +132,13 @@ pack_deps() { local fq_package=$stem.${SEMVER}${VARIANT}.tgz local tar_path=$BINDIR/$fq_package local backends_prefix_dir="" - + if [[ $depname == all ]]; then local backends_dir=. else local backends_dir=${PRODUCT}_$depname fi - + cd $INSTALL_DIR/backends { find $backends_dir -name "*.so*" | \ xargs tar -c --sort=name --owner=root:0 --group=root:0 --mtime='UTC 1970-01-01' --transform "s,^,$backends_prefix_dir," 2>> /tmp/pack.err | \ From d23333d7d427bc864a5e629469b1ca433218f718 Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Sun, 21 Mar 2021 20:36:25 +0200 Subject: [PATCH 4/4] revert the hack --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3229da8a1..f418f7398 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -442,7 +442,7 @@ after-platform-builds: &after-platform-builds platform-build-defs: &platform-build-defs <<: *after-build-and-test - <<: *on-any-branch + <<: *on-integ-and-version-tags # <<: *on-any-branch # debugging @@ -488,7 +488,7 @@ workflows: - deploy-snapshot: context: common <<: *after-platform-builds - <<: *on-any-branch + <<: *on-integ-branch - deploy-release: context: common <<: *after-platform-builds