CircleCI: multiarch docker build #7

Author: rafie

opt/build/docker/Makefile

@@ -21,8 +21,8 @@ BUILD_OPT=--rm
 FETCH_ARGS.arm64v8=WITH_ORT=0
 BUILD_ARGS.arm64v8=WITH_ORT=0
 
-FETCH_ARGS.arm32v7=WITH_ORT=0
-BUILD_ARGS.arm32v7=WITH_ORT=0
+FETCH_ARGS.arm32v7=WITH_ORT=0 WITH_PT=0
+BUILD_ARGS.arm32v7=WITH_ORT=0 WITH_PT=0
 
 #----------------------------------------------------------------------------------------------
 
@@ -42,7 +42,7 @@ $(eval $(call targets,PUSH,push))
 
 define build_x64 # (1=arch)
 build_$(1):
-	@docker build $(BUILD_OPT) -t $(STEM)-$(OSNICK):$(VERSION)-x64 -f $(ROOT)/Dockerfile \
+	docker build $(BUILD_OPT) -t $(STEM)-$(OSNICK):$(VERSION)-x64 -f $(ROOT)/Dockerfile \
 		--build-arg FETCH_ARGS="$(FETCH_ARGS.x64)" \
 		--build-arg BUILD_ARGS="$(BUILD_ARGS.x64)" \
 		$(ROOT)
@@ -52,7 +52,7 @@ endef
 
 define build_arm  # (1=arch)
 build_$(1):
-	@docker build $(BUILD_OPT) -t $(STEM)-$(OSNICK):$(VERSION)-$(1) -f $(ROOT)/Dockerfile.arm \
+	docker build $(BUILD_OPT) -t $(STEM)-$(OSNICK):$(VERSION)-$(1) -f $(ROOT)/Dockerfile.arm \
 		--build-arg ARCH=$(1) \
 		--build-arg FETCH_ARGS="$(FETCH_ARGS.$(1))" \
 		--build-arg BUILD_ARGS="$(BUILD_ARGS.$(1))" \
@@ -63,7 +63,7 @@ endef
 
 define push # (1=arch)
 push_$(1):
-	@docker push $(STEM)-$(OSNICK):$(VERSION)-$(1)
+	docker push $(STEM)-$(OSNICK):$(VERSION)-$(1)
 
 .PHONY: push_$(1)
 endef

opt/build/libtorch/Dockerfile.arm

@@ -9,7 +9,11 @@ ARG ARCH=arm64v8
 #----------------------------------------------------------------------------------------------
 FROM redisfab/${ARCH}-xbuild:${OSNICK} as builder
 
-ARG PT_VER=1.1.0
+# redeclare
+ARG OSNICK
+ARG ARCH
+
+ARG PT_VER=1.2.0
 
 RUN [ "cross-build-start" ] 
 
@@ -22,12 +26,9 @@ RUN pip3 install setuptools pyyaml typing
 RUN pip3 install numpy
 # RUN pip3 install mkl mkl-include
 
-RUN set -e ;\
-	git clone https://github.com/pytorch/pytorch.git ;\
-	cd pytorch ;\
-	git checkout "v${PT_VER}" ;\
-	git submodule update --init --recursive
+RUN git clone --single-branch --branch v${PT_VER} --recursive https://github.com/pytorch/pytorch.git
 
+ENV 
 ENV BUILD_PYTHON=0
 ENV USE_GLOO=1
 ENV USE_OPENCV=0
@@ -39,13 +40,14 @@ ENV NO_DISTRIBUTED=1
 ENV NO_MKLDNN=1
 ENV NO_NNPACK=1
 ENV NO_QNNPACK=1
+ENV CFLAGS="-mfpu=neon -mfloat-abi=hard"
 
 RUN set -e ;\
 	cd pytorch ;\
 	python3 setup.py install
 
 ADD ./opt/readies/ /build/readies/
-ADD ./opt/build/libtorch-arm/collect.py /build/
+ADD ./opt/build/libtorch/collect.py /build/
 
 RUN  ./collect.py
 

opt/build/libtorch/Dockerfile.x64

@@ -3,7 +3,7 @@ ARG OS=debian:buster
 #----------------------------------------------------------------------------------------------
 FROM ${OS}
 
-ARG PT_VER=1.1.0
+ARG PT_VER=1.2.0
 
 WORKDIR /build
 
@@ -14,11 +14,7 @@ RUN pip3 install setuptools pyyaml typing
 RUN pip3 install numpy
 RUN pip3 install mkl mkl-include
 
-RUN set -e ;\
-	git clone https://github.com/pytorch/pytorch.git ;\
-	cd pytorch ;\
-	git checkout "v${PT_VER}" ;\
-	git submodule update --init --recursive
+RUN git clone --single-branch --branch v${PT_VER} --recursive https://github.com/pytorch/pytorch.git
 
 ENV BUILD_PYTHON=0
 ENV USE_GLOO=1
@@ -37,6 +33,6 @@ RUN set -e ;\
 	python3 setup.py install
 
 ADD ./opt/readies/ /build/readies/
-ADD ./opt/build/libtorch-arm/collect.py /build/
+ADD ./opt/build/libtorch/collect.py /build/
 
-RUN  ./collect.py
+RUN ./collect.py