fixes 9

Author: rafie

Dockerfile.gpu-test

@@ -22,20 +22,34 @@ COPY ./opt/ opt/
 COPY ./test/test_requirements.txt test/
 
 RUN ./opt/readies/bin/getpy3
-RUN ./opt/system-setup.py
+RUN set -e ;\
+	python3 -m virtualenv venv ;\
+	. ./venv/bin/activate ;\
+	./opt/system-setup.py
 
 ARG DEPS_ARGS=""
 COPY ./get_deps.sh .
-RUN if [ "$DEPS_ARGS" = "" ]; then ./get_deps.sh gpu; else env $DEPS_ARGS ./get_deps.sh gpu; fi
+RUN set -e ;\
+	. ./venv/bin/activate ;\
+	if [ "$DEPS_ARGS" = "" ]; then \
+		./get_deps.sh gpu ;\
+	else \
+		env $DEPS_ARGS ./get_deps.sh gpu ;\
+	fi
 
 ARG BUILD_ARGS=""
 ADD ./ /build
-RUN make -C opt build GPU=1 $BUILD_ARGS SHOW=1
+RUN set -e ;\
+	. ./venv/bin/activate ;\
+	make -C opt build GPU=1 $BUILD_ARGS SHOW=1
 
 ARG PACK=1
 
-RUN if [ "$PACK" = "1" ]; then make -C opt pack GPU=1; fi
+RUN if [ "$PACK" = "1" ]; then \
+		. ./venv/bin/activate ;\
+		make -C opt pack GPU=1 ;\
+	fi
 
 RUN git remote set-url origin https://github.com/RedisAI/RedisAI
 
-CMD ["bash", "-c", "make -C opt test GPU=1 SHOW=1"]
+CMD ["bash", "-c", ". ./venv/bin/activate; make -C opt test GPU=1 SHOW=1"]

opt/Makefile

@@ -12,6 +12,10 @@ ifneq ($(VGD),)
 VALGRIND=$(VGD)
 endif
 
+ifeq ($(VALGRIND),1)
+DEBUG ?= 1
+endif
+
 ifeq ($(COV),1)
 DEBUG ?= 1
 endif
@@ -179,6 +183,8 @@ export GEN ?= 1
 export SLAVES ?= 1
 export AOF ?= 1
 
+$(info COV_DIR=$(COV_DIR))
+
 test:
 	$(COVERAGE_RESET)
 	$(SHOW)\
@@ -187,7 +193,7 @@ test:
 		GEN=$(GEN) AOF=$(AOF) SLAVES=$(SLAVES) \
 		VALGRIND=$(VALGRIND) \
 		$(ROOT)/test/tests.sh
-	$(COVERAGE_COLLECT_REPORT)
+	# $(COVERAGE_COLLECT_REPORT)
 
 valgrind:
 	$(SHOW)$(ROOT)/test/valgrind.sh $(realpath $(INSTALLED_TARGET))

opt/readies/mk/coverage.defs

@@ -14,22 +14,22 @@ COV_EXCLUDE += \
 define COVERAGE_RESET
 $(SHOW)set -e ;\
 echo "Starting coverage analysys." ;\
-mkdir -p $$(COV_DIR) ;\
-lcov --directory $$(BINROOT) --base-directory $$(SRCDIR) -z > /dev/null 2>&1
+mkdir -p $(COV_DIR) ;\
+lcov --directory $(BINROOT) --base-directory $(SRCDIR) -z > /dev/null 2>&1
 endef
 
 define COVERAGE_COLLECT
 $(SHOW)set -e ;\
 echo "Collecting coverage data ..." ;\
-lcov --capture --directory $$(BINROOT) --base-directory $$(SRCDIR) --output-file $$(COV_INFO) > /dev/null 2>&1 ;\
-lcov -o $$(COV_INFO) -r $$(COV_INFO) $$(COV_EXCLUDE) > /dev/null 2>&1
+lcov --capture --directory $(BINROOT) --base-directory $(SRCDIR) --output-file $(COV_INFO) > /dev/null 2>&1 ;\
+lcov -o $(COV_INFO) -r $(COV_INFO) $(COV_EXCLUDE) > /dev/null 2>&1
 endef
 
 define COVERAGE_REPORT
 $(SHOW)set -e ;\
-lcov -l $$(COV_INFO) ;\
-genhtml --legend -o $$(COV_DIR) $$(COV_INFO) > /dev/null 2>&1 ;\
-echo "Coverage info at $$(realpath $$(COV_DIR))/index.html"
+lcov -l $(COV_INFO) ;\
+genhtml --legend -o $(COV_DIR) $(COV_INFO) > /dev/null 2>&1 ;\
+echo "Coverage info at $$(realpath $(COV_DIR))/index.html"
 endef
 
 define COVERAGE_COLLECT_REPORT