From c30d565bdde8592331f374c3bc9de3fffc157f97 Mon Sep 17 00:00:00 2001 From: Jithun Nair Date: Tue, 8 Oct 2024 05:44:46 +0000 Subject: [PATCH] AOTriton: download binary from github, NO BUILD FROM SOURCE option Fix tarball's suffix Read rocm version from variables set by LoadHIP.cmake Copy AOTRITON_INSTALLED_PREFIX/* to torch/ Otherwise bdist_wheel will miss libaotriton_v2.so Fix problems in aotriton.cmake Guard against new ROCM environment This also updates aotriton_version.txt's format Supply ROCM versions and SHA256 checksums as lists. Let install_aotriton.sh parse the new format of aotriton_version.txt Do not hardcode __AOTRITON_ARCH Updates to aotriton build steps and Dockerfiles (#1599) Changes cherry-picked from pytorch#137443 --- .ci/docker/aotriton_version.txt | 5 ----- .ci/docker/centos-rocm/Dockerfile | 7 ------- .ci/docker/common/install_aotriton.sh | 21 --------------------- .ci/docker/ubuntu-rocm/Dockerfile | 7 ------- 4 files changed, 40 deletions(-) delete mode 100644 .ci/docker/aotriton_version.txt delete mode 100755 .ci/docker/common/install_aotriton.sh diff --git a/.ci/docker/aotriton_version.txt b/.ci/docker/aotriton_version.txt deleted file mode 100644 index 1869c01146123..0000000000000 --- a/.ci/docker/aotriton_version.txt +++ /dev/null @@ -1,5 +0,0 @@ -0.7.1b -manylinux_2_17 -rocm6.2 -f6b28a9b7265b69e3df54ea6ba0237e8a8d6f736 -df00412ae36fe5732d0a4601802bd3622b5dec12df7ec86027c5147adeb54c25 diff --git a/.ci/docker/centos-rocm/Dockerfile b/.ci/docker/centos-rocm/Dockerfile index 9ef063e7e851e..e5a23c0509689 100644 --- a/.ci/docker/centos-rocm/Dockerfile +++ b/.ci/docker/centos-rocm/Dockerfile @@ -115,13 +115,6 @@ COPY triton_version.txt triton_version.txt RUN if [ -n "${TRITON}" ]; then bash ./install_triton.sh; fi RUN rm install_triton.sh common_utils.sh triton-rocm.txt triton_version.txt -# Install AOTriton (Early fail) -COPY ./aotriton_version.txt aotriton_version.txt -COPY ./common/common_utils.sh common_utils.sh -COPY ./common/install_aotriton.sh install_aotriton.sh -RUN ["/bin/bash", "-c", "./install_aotriton.sh /opt/rocm && rm -rf install_aotriton.sh aotriton_version.txt common_utils.sh"] -ENV AOTRITON_INSTALLED_PREFIX /opt/rocm/aotriton - # Install ccache/sccache (do this last, so we get priority in PATH) COPY ./common/install_cache.sh install_cache.sh ENV PATH /opt/cache/bin:$PATH diff --git a/.ci/docker/common/install_aotriton.sh b/.ci/docker/common/install_aotriton.sh deleted file mode 100755 index ebf09e1e74608..0000000000000 --- a/.ci/docker/common/install_aotriton.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -set -ex - -TARBALL='aotriton.tar.gz' -# This read command alwasy returns with exit code 1 -read -d "\n" VER MANYLINUX ROCMBASE PINNED_COMMIT SHA256 < aotriton_version.txt || true -ARCH=$(uname -m) -AOTRITON_INSTALL_PREFIX="$1" -AOTRITON_URL="https://github.com/ROCm/aotriton/releases/download/${VER}/aotriton-${VER}-${MANYLINUX}_${ARCH}-${ROCMBASE}-shared.tar.gz" - -cd "${AOTRITON_INSTALL_PREFIX}" -# Must use -L to follow redirects -curl -L --retry 3 -o "${TARBALL}" "${AOTRITON_URL}" -ACTUAL_SHA256=$(sha256sum "${TARBALL}" | cut -d " " -f 1) -if [ "${SHA256}" != "${ACTUAL_SHA256}" ]; then - echo -n "Error: The SHA256 of downloaded tarball is ${ACTUAL_SHA256}," - echo " which does not match the expected value ${SHA256}." - exit -fi -tar xf "${TARBALL}" && rm -rf "${TARBALL}" diff --git a/.ci/docker/ubuntu-rocm/Dockerfile b/.ci/docker/ubuntu-rocm/Dockerfile index ee9ede8ba611b..cc43d9ec24142 100644 --- a/.ci/docker/ubuntu-rocm/Dockerfile +++ b/.ci/docker/ubuntu-rocm/Dockerfile @@ -105,13 +105,6 @@ COPY triton_version.txt triton_version.txt RUN if [ -n "${TRITON}" ]; then bash ./install_triton.sh; fi RUN rm install_triton.sh common_utils.sh triton-rocm.txt triton_version.txt -# Install AOTriton -COPY ./aotriton_version.txt aotriton_version.txt -COPY ./common/common_utils.sh common_utils.sh -COPY ./common/install_aotriton.sh install_aotriton.sh -RUN ["/bin/bash", "-c", "./install_aotriton.sh /opt/rocm && rm -rf install_aotriton.sh aotriton_version.txt common_utils.sh"] -ENV AOTRITON_INSTALLED_PREFIX /opt/rocm/aotriton - # Install ccache/sccache (do this last, so we get priority in PATH) COPY ./common/install_cache.sh install_cache.sh ENV PATH /opt/cache/bin:$PATH