Skip to content

Commit 67b62e5

Browse files
xuanzhang816xuanzhang816
committed
Update
[ghstack-poisoned]
2 parents 1ebbf4f + 6faaa6c commit 67b62e5

File tree

407 files changed

+11128
-10552
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

407 files changed

+11128
-10552
lines changed

‎.ci/docker/almalinux/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ RUN bash ./install_mnist.sh
7878
FROM base as all_cuda
7979
COPY --from=cuda11.8 /usr/local/cuda-11.8 /usr/local/cuda-11.8
8080
COPY --from=cuda12.6 /usr/local/cuda-12.6 /usr/local/cuda-12.6
81-
COPY --from=cuda12.4 /usr/local/cuda-12.8 /usr/local/cuda-12.8
81+
COPY --from=cuda12.8 /usr/local/cuda-12.8 /usr/local/cuda-12.8
8282

8383
# Final step
8484
FROM ${BASE_TARGET} as final

‎.ci/docker/build.sh

Lines changed: 37 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -50,30 +50,21 @@ if [[ "$image" == *xla* ]]; then
5050
exit 0
5151
fi
5252

53-
if [[ "$image" == *-focal* ]]; then
54-
UBUNTU_VERSION=20.04
55-
elif [[ "$image" == *-jammy* ]]; then
53+
if [[ "$image" == *-jammy* ]]; then
5654
UBUNTU_VERSION=22.04
5755
elif [[ "$image" == *ubuntu* ]]; then
5856
extract_version_from_image_name ubuntu UBUNTU_VERSION
59-
elif [[ "$image" == *centos* ]]; then
60-
extract_version_from_image_name centos CENTOS_VERSION
6157
fi
6258

6359
if [ -n "${UBUNTU_VERSION}" ]; then
6460
OS="ubuntu"
65-
elif [ -n "${CENTOS_VERSION}" ]; then
66-
OS="centos"
6761
else
6862
echo "Unable to derive operating system base..."
6963
exit 1
7064
fi
7165

7266
DOCKERFILE="${OS}/Dockerfile"
73-
# When using ubuntu - 22.04, start from Ubuntu docker image, instead of nvidia/cuda docker image.
74-
if [[ "$image" == *cuda* && "$UBUNTU_VERSION" != "22.04" ]]; then
75-
DOCKERFILE="${OS}-cuda/Dockerfile"
76-
elif [[ "$image" == *rocm* ]]; then
67+
if [[ "$image" == *rocm* ]]; then
7768
DOCKERFILE="${OS}-rocm/Dockerfile"
7869
elif [[ "$image" == *xpu* ]]; then
7970
DOCKERFILE="${OS}-xpu/Dockerfile"
@@ -98,7 +89,7 @@ tag=$(echo $image | awk -F':' '{print $2}')
9889
# configuration, so we hardcode everything here rather than do it
9990
# from scratch
10091
case "$tag" in
101-
pytorch-linux-focal-cuda12.6-cudnn9-py3-gcc11)
92+
pytorch-linux-jammy-cuda12.6-cudnn9-py3-gcc11)
10293
CUDA_VERSION=12.6.3
10394
CUDNN_VERSION=9
10495
ANACONDA_PYTHON_VERSION=3.10
@@ -121,7 +112,31 @@ case "$tag" in
121112
TRITON=yes
122113
INDUCTOR_BENCHMARKS=yes
123114
;;
124-
pytorch-linux-focal-cuda12.6-cudnn9-py3-gcc9)
115+
pytorch-linux-jammy-cuda12.8-cudnn9-py3.12-gcc9-inductor-benchmarks)
116+
CUDA_VERSION=12.8.1
117+
CUDNN_VERSION=9
118+
ANACONDA_PYTHON_VERSION=3.12
119+
GCC_VERSION=9
120+
VISION=yes
121+
KATEX=yes
122+
UCX_COMMIT=${_UCX_COMMIT}
123+
UCC_COMMIT=${_UCC_COMMIT}
124+
TRITON=yes
125+
INDUCTOR_BENCHMARKS=yes
126+
;;
127+
pytorch-linux-jammy-cuda12.8-cudnn9-py3.13-gcc9-inductor-benchmarks)
128+
CUDA_VERSION=12.8.1
129+
CUDNN_VERSION=9
130+
ANACONDA_PYTHON_VERSION=3.13
131+
GCC_VERSION=9
132+
VISION=yes
133+
KATEX=yes
134+
UCX_COMMIT=${_UCX_COMMIT}
135+
UCC_COMMIT=${_UCC_COMMIT}
136+
TRITON=yes
137+
INDUCTOR_BENCHMARKS=yes
138+
;;
139+
pytorch-linux-jammy-cuda12.6-cudnn9-py3-gcc9)
125140
CUDA_VERSION=12.6.3
126141
CUDNN_VERSION=9
127142
ANACONDA_PYTHON_VERSION=3.10
@@ -168,7 +183,7 @@ case "$tag" in
168183
TRITON=yes
169184
INDUCTOR_BENCHMARKS=yes
170185
;;
171-
pytorch-linux-focal-cuda12.8-cudnn9-py3-gcc9)
186+
pytorch-linux-jammy-cuda12.8-cudnn9-py3-gcc9)
172187
CUDA_VERSION=12.8.1
173188
CUDNN_VERSION=9
174189
ANACONDA_PYTHON_VERSION=3.10
@@ -179,25 +194,25 @@ case "$tag" in
179194
UCC_COMMIT=${_UCC_COMMIT}
180195
TRITON=yes
181196
;;
182-
pytorch-linux-focal-py3-clang10-onnx)
197+
pytorch-linux-jammy-py3-clang12-onnx)
183198
ANACONDA_PYTHON_VERSION=3.9
184-
CLANG_VERSION=10
199+
CLANG_VERSION=12
185200
VISION=yes
186201
ONNX=yes
187202
;;
188-
pytorch-linux-focal-py3.9-clang10)
203+
pytorch-linux-jammy-py3.9-clang12)
189204
ANACONDA_PYTHON_VERSION=3.9
190-
CLANG_VERSION=10
205+
CLANG_VERSION=12
191206
VISION=yes
192207
TRITON=yes
193208
;;
194-
pytorch-linux-focal-py3.11-clang10)
209+
pytorch-linux-jammy-py3.11-clang12)
195210
ANACONDA_PYTHON_VERSION=3.11
196-
CLANG_VERSION=10
211+
CLANG_VERSION=12
197212
VISION=yes
198213
TRITON=yes
199214
;;
200-
pytorch-linux-focal-py3.9-gcc9)
215+
pytorch-linux-jammy-py3.9-gcc9)
201216
ANACONDA_PYTHON_VERSION=3.9
202217
GCC_VERSION=9
203218
VISION=yes
@@ -303,7 +318,7 @@ case "$tag" in
303318
GCC_VERSION=11
304319
TRITON_CPU=yes
305320
;;
306-
pytorch-linux-focal-linter)
321+
pytorch-linux-jammy-linter)
307322
# TODO: Use 3.9 here because of this issue https://github.com/python/mypy/issues/13627.
308323
# We will need to update mypy version eventually, but that's for another day. The task
309324
# would be to upgrade mypy to 1.0.0 with Python 3.11
@@ -370,14 +385,6 @@ esac
370385

371386
tmp_tag=$(basename "$(mktemp -u)" | tr '[:upper:]' '[:lower:]')
372387

373-
#when using cudnn version 8 install it separately from cuda
374-
if [[ "$image" == *cuda* && ${OS} == "ubuntu" ]]; then
375-
IMAGE_NAME="nvidia/cuda:${CUDA_VERSION}-cudnn${CUDNN_VERSION}-devel-ubuntu${UBUNTU_VERSION}"
376-
if [[ ${CUDNN_VERSION} == 9 ]]; then
377-
IMAGE_NAME="nvidia/cuda:${CUDA_VERSION}-devel-ubuntu${UBUNTU_VERSION}"
378-
fi
379-
fi
380-
381388
no_cache_flag=""
382389
progress_flag=""
383390
# Do not use cache and progress=plain when in CI
@@ -394,7 +401,6 @@ docker build \
394401
--build-arg "LLVMDEV=${LLVMDEV:-}" \
395402
--build-arg "VISION=${VISION:-}" \
396403
--build-arg "UBUNTU_VERSION=${UBUNTU_VERSION}" \
397-
--build-arg "CENTOS_VERSION=${CENTOS_VERSION}" \
398404
--build-arg "DEVTOOLSET_VERSION=${DEVTOOLSET_VERSION}" \
399405
--build-arg "GLIBC_VERSION=${GLIBC_VERSION}" \
400406
--build-arg "CLANG_VERSION=${CLANG_VERSION}" \

‎.ci/docker/ci_commit_pins/executorch.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b173722085b3f555d6ba4533d6bbaddfd7c71144
1+
f50bfa92602b45dca884a9e511e5d9ddbe8ba314

‎.ci/docker/ubuntu-cuda/Dockerfile

Lines changed: 0 additions & 170 deletions
This file was deleted.

‎.ci/manywheel/build_rocm.sh

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ ROCM_SO_FILES=(
9595
"libroctracer64.so"
9696
"libroctx64.so"
9797
"libhipblaslt.so"
98+
"libhipsparselt.so"
9899
"libhiprtc.so"
99100
)
100101

@@ -186,20 +187,28 @@ do
186187
OS_SO_FILES[${#OS_SO_FILES[@]}]=$file_name # Append lib to array
187188
done
188189

190+
ARCH=$(echo $PYTORCH_ROCM_ARCH | sed 's/;/|/g') # Replace ; seperated arch list to bar for grep
191+
189192
# rocBLAS library files
190193
ROCBLAS_LIB_SRC=$ROCM_HOME/lib/rocblas/library
191194
ROCBLAS_LIB_DST=lib/rocblas/library
192-
ARCH=$(echo $PYTORCH_ROCM_ARCH | sed 's/;/|/g') # Replace ; seperated arch list to bar for grep
193-
ARCH_SPECIFIC_FILES=$(ls $ROCBLAS_LIB_SRC | grep -E $ARCH)
194-
OTHER_FILES=$(ls $ROCBLAS_LIB_SRC | grep -v gfx)
195-
ROCBLAS_LIB_FILES=($ARCH_SPECIFIC_FILES $OTHER_FILES)
195+
ROCBLAS_ARCH_SPECIFIC_FILES=$(ls $ROCBLAS_LIB_SRC | grep -E $ARCH)
196+
ROCBLAS_OTHER_FILES=$(ls $ROCBLAS_LIB_SRC | grep -v gfx)
197+
ROCBLAS_LIB_FILES=($ROCBLAS_ARCH_SPECIFIC_FILES $OTHER_FILES)
196198

197199
# hipblaslt library files
198200
HIPBLASLT_LIB_SRC=$ROCM_HOME/lib/hipblaslt/library
199201
HIPBLASLT_LIB_DST=lib/hipblaslt/library
200-
ARCH_SPECIFIC_FILES=$(ls $HIPBLASLT_LIB_SRC | grep -E $ARCH)
201-
OTHER_FILES=$(ls $HIPBLASLT_LIB_SRC | grep -v gfx)
202-
HIPBLASLT_LIB_FILES=($ARCH_SPECIFIC_FILES $OTHER_FILES)
202+
HIPBLASLT_ARCH_SPECIFIC_FILES=$(ls $HIPBLASLT_LIB_SRC | grep -E $ARCH)
203+
HIPBLASLT_OTHER_FILES=$(ls $HIPBLASLT_LIB_SRC | grep -v gfx)
204+
HIPBLASLT_LIB_FILES=($HIPBLASLT_ARCH_SPECIFIC_FILES $HIPBLASLT_OTHER_FILES)
205+
206+
# hipsparselt library files
207+
HIPSPARSELT_LIB_SRC=$ROCM_HOME/lib/hipsparselt/library
208+
HIPSPARSELT_LIB_DST=lib/hipsparselt/library
209+
HIPSPARSELT_ARCH_SPECIFIC_FILES=$(ls $HIPSPARSELT_LIB_SRC | grep -E $ARCH)
210+
#HIPSPARSELT_OTHER_FILES=$(ls $HIPSPARSELT_LIB_SRC | grep -v gfx)
211+
HIPSPARSELT_LIB_FILES=($HIPSPARSELT_ARCH_SPECIFIC_FILES $HIPSPARSELT_OTHER_FILES)
203212

204213
# ROCm library files
205214
ROCM_SO_PATHS=()
@@ -234,12 +243,14 @@ DEPS_SONAME=(
234243
DEPS_AUX_SRCLIST=(
235244
"${ROCBLAS_LIB_FILES[@]/#/$ROCBLAS_LIB_SRC/}"
236245
"${HIPBLASLT_LIB_FILES[@]/#/$HIPBLASLT_LIB_SRC/}"
246+
"${HIPSPARSELT_LIB_FILES[@]/#/$HIPSPARSELT_LIB_SRC/}"
237247
"/opt/amdgpu/share/libdrm/amdgpu.ids"
238248
)
239249

240250
DEPS_AUX_DSTLIST=(
241251
"${ROCBLAS_LIB_FILES[@]/#/$ROCBLAS_LIB_DST/}"
242252
"${HIPBLASLT_LIB_FILES[@]/#/$HIPBLASLT_LIB_DST/}"
253+
"${HIPSPARSELT_LIB_FILES[@]/#/$HIPSPARSELT_LIB_DST/}"
243254
"share/libdrm/amdgpu.ids"
244255
)
245256

0 commit comments

Comments
 (0)