From 68f106cd536999d8a27a7eb1513a828881428328 Mon Sep 17 00:00:00 2001 From: atalman Date: Mon, 22 Apr 2024 17:09:42 -0700 Subject: [PATCH 1/3] Adjust docker gpu aarch64 docker image --- manywheel/build_docker.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/manywheel/build_docker.sh b/manywheel/build_docker.sh index 710690463..5da3cff88 100755 --- a/manywheel/build_docker.sh +++ b/manywheel/build_docker.sh @@ -9,7 +9,6 @@ DOCKER_REGISTRY="${DOCKER_REGISTRY:-docker.io}" GPU_ARCH_TYPE=${GPU_ARCH_TYPE:-cpu} GPU_ARCH_VERSION=${GPU_ARCH_VERSION:-} MANY_LINUX_VERSION=${MANY_LINUX_VERSION:-} - WITH_PUSH=${WITH_PUSH:-} case ${GPU_ARCH_TYPE} in @@ -54,11 +53,11 @@ case ${GPU_ARCH_TYPE} in ;; cuda-aarch64) TARGET=cuda_final - DOCKER_TAG=cuda-aarch64 + DOCKER_TAG=cuda${GPU_ARCH_VERSION} LEGACY_DOCKER_IMAGE=${DOCKER_REGISTRY}/pytorch/manylinux-cuda-aarch64 GPU_IMAGE=arm64v8/centos:7 DOCKER_GPU_BUILD_ARG="--build-arg BASE_CUDA_VERSION=${GPU_ARCH_VERSION} --build-arg DEVTOOLSET_VERSION=11" - MANY_LINUX_VERSION="aarch64" + MANY_LINUX_VERSION="cuda_aarch64" ;; rocm) TARGET=rocm_final From 1dfbfebe3c7282094950c2f3345fb5dd815a1c75 Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 23 Apr 2024 11:12:49 -0700 Subject: [PATCH 2/3] same_image --- manywheel/build_docker.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manywheel/build_docker.sh b/manywheel/build_docker.sh index 5da3cff88..ffc627828 100755 --- a/manywheel/build_docker.sh +++ b/manywheel/build_docker.sh @@ -9,6 +9,7 @@ DOCKER_REGISTRY="${DOCKER_REGISTRY:-docker.io}" GPU_ARCH_TYPE=${GPU_ARCH_TYPE:-cpu} GPU_ARCH_VERSION=${GPU_ARCH_VERSION:-} MANY_LINUX_VERSION=${MANY_LINUX_VERSION:-} +DOCKERFILE_SUFFIX=${DOCKERFILE_SUFFIX:-} WITH_PUSH=${WITH_PUSH:-} case ${GPU_ARCH_TYPE} in @@ -54,10 +55,11 @@ case ${GPU_ARCH_TYPE} in cuda-aarch64) TARGET=cuda_final DOCKER_TAG=cuda${GPU_ARCH_VERSION} - LEGACY_DOCKER_IMAGE=${DOCKER_REGISTRY}/pytorch/manylinux-cuda-aarch64 + LEGACY_DOCKER_IMAGE='' GPU_IMAGE=arm64v8/centos:7 DOCKER_GPU_BUILD_ARG="--build-arg BASE_CUDA_VERSION=${GPU_ARCH_VERSION} --build-arg DEVTOOLSET_VERSION=11" - MANY_LINUX_VERSION="cuda_aarch64" + MANY_LINUX_VERSION="aarch64" + DOCKERFILE_SUFFIX="cuda_aarch64" ;; rocm) TARGET=rocm_final @@ -86,11 +88,9 @@ esac IMAGES='' DOCKER_NAME=manylinux${MANY_LINUX_VERSION} DOCKER_IMAGE=${DOCKER_REGISTRY}/pytorch/${DOCKER_NAME}-builder:${DOCKER_TAG} -if [[ -n ${MANY_LINUX_VERSION} ]]; then +if [[ -n ${MANY_LINUX_VERSION} && -z ${DOCKERFILE_SUFFIX} ]]; then DOCKERFILE_SUFFIX=_${MANY_LINUX_VERSION} LEGACY_DOCKER_IMAGE='' -else - DOCKERFILE_SUFFIX='' fi ( set -x From 806c1b2107dc3adf38991be6c8cb7c4ceb5486f7 Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 23 Apr 2024 11:16:03 -0700 Subject: [PATCH 3/3] test --- manywheel/build_docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manywheel/build_docker.sh b/manywheel/build_docker.sh index ffc627828..4d3816588 100755 --- a/manywheel/build_docker.sh +++ b/manywheel/build_docker.sh @@ -59,7 +59,7 @@ case ${GPU_ARCH_TYPE} in GPU_IMAGE=arm64v8/centos:7 DOCKER_GPU_BUILD_ARG="--build-arg BASE_CUDA_VERSION=${GPU_ARCH_VERSION} --build-arg DEVTOOLSET_VERSION=11" MANY_LINUX_VERSION="aarch64" - DOCKERFILE_SUFFIX="cuda_aarch64" + DOCKERFILE_SUFFIX="_cuda_aarch64" ;; rocm) TARGET=rocm_final