From 89de588623e4c72bd8b3d68e61c42f4041a5641f Mon Sep 17 00:00:00 2001 From: Kenichi Maehashi Date: Mon, 9 Sep 2024 03:27:57 +0000 Subject: [PATCH 1/2] remove Jetson-related files --- builder/Dockerfile.jetson | 48 --------------------- builder/base/cuda-10.2-jetson/.dockerignore | 2 - builder/base/cuda-10.2-jetson/.gitignore | 4 -- builder/base/cuda-10.2-jetson/Dockerfile | 4 -- builder/base/cuda-10.2-jetson/build.sh | 28 ------------ builder/build-wrapper-jetson | 7 --- 6 files changed, 93 deletions(-) delete mode 100644 builder/Dockerfile.jetson delete mode 100644 builder/base/cuda-10.2-jetson/.dockerignore delete mode 100644 builder/base/cuda-10.2-jetson/.gitignore delete mode 100644 builder/base/cuda-10.2-jetson/Dockerfile delete mode 100755 builder/base/cuda-10.2-jetson/build.sh delete mode 100755 builder/build-wrapper-jetson diff --git a/builder/Dockerfile.jetson b/builder/Dockerfile.jetson deleted file mode 100644 index 2eb3691a..00000000 --- a/builder/Dockerfile.jetson +++ /dev/null @@ -1,48 +0,0 @@ -ARG base_image -FROM ${base_image} - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get -y update && \ - apt-get -y install gcc g++ make patch git && \ - apt-get -y install libbz2-dev liblzma-dev libssl-dev libreadline-dev libffi-dev && \ - apt-get -y install python && \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/* - -# Install pyenv requirements. -# https://github.com/pyenv/pyenv/wiki/Common-build-problems#requirements -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get -y update && \ - apt-get install -y make build-essential libssl-dev zlib1g-dev libbz2-dev \ - libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev \ - libncursesw5-dev xz-utils tk-dev && \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/* - -# Install Python. -ARG python_versions -ARG cython_version -ARG fastrlock_version -RUN git clone https://github.com/pyenv/pyenv.git /opt/pyenv -ENV PYENV_ROOT=/opt/pyenv -ENV PATH ${PYENV_ROOT}/shims:${PYENV_ROOT}/bin:${PATH} -COPY setup_python.sh / -RUN /setup_python.sh "${python_versions}" "${cython_version}" "${fastrlock_version}" - -# Install additional libraries for CUDA. -COPY cuda_lib/ /cuda_lib -COPY setup_cuda_opt_lib.py / -RUN /setup_cuda_opt_lib.py --src /cuda_lib --dst /usr/local/cuda - -# Install additional dependicies. -ARG system_packages -RUN [ -z "${system_packages}" ] || ( \ - export DEBIAN_FRONTEND=noninteractive && \ - apt-get -y update && \ - apt-get -y install ${system_packages} && \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/* \ - ) - -# Add build agent. -COPY build-wrapper-jetson /build-wrapper -COPY agent.py / - -ENTRYPOINT ["/agent.py"] diff --git a/builder/base/cuda-10.2-jetson/.dockerignore b/builder/base/cuda-10.2-jetson/.dockerignore deleted file mode 100644 index 95e805ce..00000000 --- a/builder/base/cuda-10.2-jetson/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!_jetson-rootfs.tar diff --git a/builder/base/cuda-10.2-jetson/.gitignore b/builder/base/cuda-10.2-jetson/.gitignore deleted file mode 100644 index 2b1faabe..00000000 --- a/builder/base/cuda-10.2-jetson/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -image.zip -sd-blob-b01.img -_jetson-rootfs.tar -_jetson-rootfs/ diff --git a/builder/base/cuda-10.2-jetson/Dockerfile b/builder/base/cuda-10.2-jetson/Dockerfile deleted file mode 100644 index c7458363..00000000 --- a/builder/base/cuda-10.2-jetson/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM scratch -ADD _jetson-rootfs.tar / -RUN /bin/sed -i 's||t210|g' /etc/apt/sources.list.d/nvidia-l4t-apt-source.list -CMD /bin/bash diff --git a/builder/base/cuda-10.2-jetson/build.sh b/builder/base/cuda-10.2-jetson/build.sh deleted file mode 100755 index e04978c7..00000000 --- a/builder/base/cuda-10.2-jetson/build.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -# This script requires sudo privilage, and assumes parted (partprobe) installed. -# Note: this process cannot be containerized as `partprobe` relies on udev. - -set -uex - -sudo echo "Checking sudo privilage" - -if [ ! -f sd-blob-b01.img ]; then - if [ ! -f image.zip ]; then - wget -q -O image.zip "https://developer.nvidia.com/embedded/l4t/r32_release_v6.1/jeston_nano/jetson-nano-jp46-sd-card-image.zip" - fi - unzip image.zip -fi - -LOOP_DEV=$(sudo losetup --show -f sd-blob-b01.img) -trap "sudo umount ${LOOP_DEV}p1; sudo losetup -d ${LOOP_DEV}" EXIT -sudo partprobe "${LOOP_DEV}" -mkdir -p _jetson-rootfs -sudo mount -o ro "${LOOP_DEV}p1" _jetson-rootfs -sudo tar cf _jetson-rootfs.tar -C _jetson-rootfs . - -[[ $(uname -m) = aarch64 ]] || docker run --rm --privileged multiarch/qemu-user-static --reset -p yes -export DOCKER_BUILDKIT=1 -docker build -t cupy/cupy-release-tools:cuda-10.2-jetson --build-arg BUILDKIT_INLINE_CACHE=1 . -echo "Done. Maintainers can push the Docker image by:" -echo "$ docker push cupy/cupy-release-tools:cuda-10.2-jetson" diff --git a/builder/build-wrapper-jetson b/builder/build-wrapper-jetson deleted file mode 100755 index afba6c92..00000000 --- a/builder/build-wrapper-jetson +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -export CUPY_NVCC_GENERATE_CODE="arch=compute_72,code=sm_72;arch=compute_62,code=sm_62;arch=compute_53,code=sm_53" - -export LDFLAGS="-Wl,--as-needed ${LDFLAGS}" - -"$@" From a7c64b8ce0a36e9562b5431a053e2b63834bd45c Mon Sep 17 00:00:00 2001 From: Kenichi Maehashi Date: Mon, 9 Sep 2024 03:28:20 +0000 Subject: [PATCH 2/2] remove Jetson related things --- .pfnci/config.pbtxt | 15 --------------- README.rst | 1 - build.sh | 4 ---- 3 files changed, 20 deletions(-) diff --git a/.pfnci/config.pbtxt b/.pfnci/config.pbtxt index b49f9c49..dc5c7304 100644 --- a/.pfnci/config.pbtxt +++ b/.pfnci/config.pbtxt @@ -13,21 +13,6 @@ configs { command: ".pfnci/wheel-linux/main.sh 12.x 3.9" } } -configs { - key: "cupy-release-tools.linux.jetson" - value { - requirement { - cpu: 8 - memory: 36 - disk: 30 - } - time_limit { - seconds: 18000 - } - command: ".pfnci/wheel-linux/main.sh 10.2-jetson 3.9" - environment_variables { key: "CUPY_RELEASE_SKIP_VERIFY" value: "1" } - } -} configs { key: "cupy-release-tools.linux.rocm" value { diff --git a/README.rst b/README.rst index c55a8963..a1693cb8 100644 --- a/README.rst +++ b/README.rst @@ -79,7 +79,6 @@ This example builds wheel of CuPy with CUDA 10.0 for Python 3.8. ./dist.py --action build --target wheel-linux --python 3.8 --cuda 10.0 --source path/to/cupy_repo Use ``--target wheel-win`` for Windows build. -Use ``--cuda 10.2-jetson`` for JetPack (Tegra / CUDA 10.2 aarch64) build. Use ``--cuda rocm-5.0`` for ROCm (AMD GPU) build. The resulting asset (sdist/wheel) will be generated to the current directory. diff --git a/build.sh b/build.sh index 95f0bb57..62507bd4 100755 --- a/build.sh +++ b/build.sh @@ -22,10 +22,6 @@ case ${CUDA} in # CUDA (sdist) VERIFY_ARGS="${VERIFY_ARGS} --test release-tests/sparse --test release-tests/cudnn --test release-tests/nccl --test release-tests/pkg_sdist" ;; - 10.2-jetson ) - # CUDA Jetson (wheel) - VERIFY_ARGS="${VERIFY_ARGS} --test release-tests/sparse --test release-tests/cudnn" - ;; rocm-* ) # ROCm (wheel) VERIFY_ARGS="${VERIFY_ARGS}"