Build fixes #6

Author: rafie

.circleci/config.yml

@@ -24,9 +24,6 @@ commands:
           paths:
             - deps
           key: v1-dependencies-{{ checksum "get_deps.sh" }}
-      - run:
-          name: Pull Submodules
-          command: make -C automation fetch
       - run:
           name: Build
           command: make -C automation all SHOW=1

CMakeLists.txt

@@ -27,7 +27,7 @@ IF (NOT DEPS_PATH)
 ENDIF()
 
 IF (NOT INSTALL_PATH)
-    SET(INSTALL_PATH ../install-${DEVICE})
+    SET(INSTALL_PATH ${CMAKE_SOURCE_DIR}/install-${DEVICE})
 ENDIF()
 
 GET_FILENAME_COMPONENT(depsAbs
@@ -102,6 +102,8 @@ IF (APPLE)
         LINK_FLAGS "-undefined dynamic_lookup")
 ENDIF()
 
+SET(CMAKE_INSTALL_PREFIX ${installAbs})
+
 INSTALL(TARGETS redisai LIBRARY DESTINATION .)
 
 IF (APPLE)

Dockerfile

@@ -4,7 +4,7 @@
 ARG OSNICK=buster
 
 # OS=debian:buster-slim|debian:stretch-slim|ubuntu:bionic
-OS=debian:buster-slim
+ARG OS=debian:buster-slim
 
 # ARCH=x64|arm64v8|arm32v7
 ARG ARCH=x64
@@ -25,8 +25,8 @@ RUN ./automation/system-setup.py
 COPY ./get_deps.sh .
 RUN ./get_deps.sh cpu
 
-ADD ./ /redisai
-RUN make -C automation all SHOW=1
+ADD ./ /build
+RUN make -C automation build SHOW=1
 
 ARG PACK=0
 ARG TEST=0

automation/Makefile

@@ -57,7 +57,7 @@ include $(MK)/rules
 #---------------------------------------------------------------------------------------------- 
 
 prebuild:
-	$(SHOW)if [ ! -d $(ROOT)/deps ]; then echo $$'Dependencies are not in place.\nPlease run \'make fetch\'.'; exit 1; fi
+	$(SHOW)if [ ! -d $(DEPS_DIR) ]; then echo $$'Dependencies are not in place.\nPlease run \'make fetch\'.'; exit 1; fi
 
 $(TARGET): prebuild $(MK_MAKEFILES) $(DEPS)
 	$(SHOW)mkdir -p $(INSTALL_DIR)
@@ -66,17 +66,22 @@ $(TARGET): prebuild $(MK_MAKEFILES) $(DEPS)
 #	$(SHOW)cd $(ROOT) ;\
 #	if [ ! -e install ]; then ln -sf install-$(DEVICE) install; fi
 
+install:
+	$(SHOW)mkdir -p $(INSTALL_DIR)
+	$(SHOW)$(MAKE) -C $(BINDIR) install
+
 clean:
 ifeq ($(ALL),1)
-	$(SHOW)cd $(ROOT) ;\
-	rm -rf build install deps/dlpack deps/install-$(DEVICE) deps/*.tar.gz deps/*.zip deps/*.tgz
+	$(SHOW)if [ -d "$(BINROOT)" ]; then rm -rf $(BINROOT); fi
+	$(SHOW)if [ -d "$(INSTALL_DIR)" ]; then rm -rf $(INSTALL_DIR); fi
+	$(SHOW)rm -f $(ROOT)/install-$(DEVICE)
 else
 	$(SHOW)$(MAKE) -C $(BINDIR) clean
 endif
 
 #---------------------------------------------------------------------------------------------- 
 
-fetch:
+fetch deps:
 	@echo Fetching dependencies...
 	$(SHOW)VERBOSE=$(_SHOW) $(ROOT)/get_deps.sh $(DEPS_FLAGS)
 
@@ -103,5 +108,6 @@ test:
 	$(SHOW)set -e ;\
 	cd $(ROOT)/test ;\
 	python3 -m RLTest $(TEST_ARGS) --test basic_tests.py \
-		--junitxml=$(TEST_REPORT_DIR)/tests_report.xml \
 		--module $(INSTALL_DIR)/redisai.so
+
+#		--junitxml=$(TEST_REPORT_DIR)/tests_report.xml

automation/readies/mk/variant.defs

@@ -8,8 +8,8 @@ ARCH=$(shell $(ROOT)/automation/readies/bin/platform --arch)
 
 #----------------------------------------------------------------------------------------------
 
-GIT_SHA := $(shell git rev-parse HEAD)
-GIT_COMMIT := $(shell git describe --always --abbrev=7 --dirty="+")
+# GIT_SHA := $(shell git rev-parse HEAD)
+# GIT_COMMIT := $(shell git describe --always --abbrev=7 --dirty="+")
 
 #----------------------------------------------------------------------------------------------
 

automation/system-setup.py

@@ -58,7 +58,8 @@ def common_last(self):
             self.pip3_install("git+https://github.com/RedisLabsModules/RLTest.git@master")
         if not self.has_command("ramp"):
             self.pip3_install("git+https://github.com/RedisLabs/RAMP@master")
-        self.pip3_install("-r ../test/test_requirements.txt")
+        root = os.path.join(os.path.dirname(__file__), "..")
+        self.pip3_install("-r {}/test/test_requirements.txt".format(root))
 
 #----------------------------------------------------------------------------------------------
 

get_deps.sh

@@ -42,6 +42,9 @@ fi
 OS=$(python3 $HERE/automation/readies/bin/platform --os)
 ARCH=$(python3 $HERE/automation/readies/bin/platform --arch)
 
+# avoid wget warnings on macOS
+[[ $OS == macosx ]] && export LC_ALL=en_US.UTF-8
+
 DEPS_DIR=$HERE/deps/$OS-$ARCH-$DEVICE
 mkdir -p ${DEPS_DIR}
 cd ${DEPS_DIR}