Skip to content

Commit 1f0ad7d

Browse files
nkaretnikovnkaretnikov
committed
Update on "[pt2] add SymInt support for tensordot and inner"
[ghstack-poisoned]
2 parents 40d6aa8 + b8f3e4e commit 1f0ad7d

File tree

87 files changed

+1707
-732
lines changed

Some content is hidden

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

87 files changed

+1707
-732
lines changed

‎.ci/docker/build.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@ fi
8181
# CMake 3.18 is needed to support CUDA17 language variant
8282
CMAKE_VERSION=3.18.5
8383

84-
_UCX_COMMIT=31e74cac7bee0ef66bef2af72e7d86d9c282e5ab
85-
_UCC_COMMIT=1c7a7127186e7836f73aafbd7697bbc274a77eee
84+
_UCX_COMMIT=00bcc6bb18fc282eb160623b4c0d300147f579af
85+
_UCC_COMMIT=7cb07a76ccedad7e56ceb136b865eb9319c258ea
8686

8787
# It's annoying to rename jobs every time you want to rewrite a
8888
# configuration, so we hardcode everything here rather than do it
8989
# from scratch
9090
case "$image" in
91-
pytorch-linux-bionic-cuda11.7-cudnn8-py3-gcc7)
92-
CUDA_VERSION=11.7.0
91+
pytorch-linux-bionic-cuda12.1-cudnn8-py3-gcc7)
92+
CUDA_VERSION=12.1.0
9393
CUDNN_VERSION=8
9494
ANACONDA_PYTHON_VERSION=3.10
9595
GCC_VERSION=7

‎.ci/docker/centos-rocm/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ ENV INSTALLED_DB ${DB}
6464

6565
# (optional) Install vision packages like OpenCV and ffmpeg
6666
ARG VISION
67-
COPY ./common/install_vision.sh install_vision.sh
67+
COPY ./common/install_vision.sh ./common/cache_vision_models.sh ./common/common_utils.sh ./
6868
RUN if [ -n "${VISION}" ]; then bash ./install_vision.sh; fi
69-
RUN rm install_vision.sh
69+
RUN rm install_vision.sh cache_vision_models.sh common_utils.sh
7070
ENV INSTALLED_VISION ${VISION}
7171

7272
# Install rocm

‎.ci/docker/common/cache_vision_models.sh‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
3+
set -ex
4+
5+
source "$(dirname "${BASH_SOURCE[0]}")/common_utils.sh"
6+
7+
# Cache the test models at ~/.cache/torch/hub/
8+
IMPORT_SCRIPT_FILENAME="/tmp/torchvision_import_script.py"
9+
as_jenkins echo 'import torchvision; torchvision.models.mobilenet_v2(pretrained=True); torchvision.models.mobilenet_v3_large(pretrained=True);' > "${IMPORT_SCRIPT_FILENAME}"
10+
11+
pip_install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/cpu
12+
# Very weird quoting behavior here https://github.com/conda/conda/issues/10972,
13+
# so echo the command to a file and run the file instead
14+
conda_run python "${IMPORT_SCRIPT_FILENAME}"
15+
16+
# Cleaning up
17+
conda_run pip uninstall -y torch torchvision
18+
rm "${IMPORT_SCRIPT_FILENAME}" || true

‎.ci/docker/common/install_android.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,6 @@ chgrp -R jenkins /var/lib/jenkins/.gradle
107107
popd
108108

109109
rm -rf /var/lib/jenkins/.gradle/daemon
110+
111+
# Cache vision models used by the test
112+
source "$(dirname "${BASH_SOURCE[0]}")/cache_vision_models.sh"

‎.ci/docker/common/install_cudnn.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ if [[ ${CUDNN_VERSION} == 8 ]]; then
44
# cuDNN license: https://developer.nvidia.com/cudnn/license_agreement
55
mkdir tmp_cudnn && cd tmp_cudnn
66
CUDNN_NAME="cudnn-linux-x86_64-8.3.2.44_cuda11.5-archive"
7-
if [[ ${CUDA_VERSION:0:4} == "11.7" ]]; then
8-
CUDNN_NAME="cudnn-linux-x86_64-8.5.0.96_cuda11-archive"
9-
curl --retry 3 -OLs https://ossci-linux.s3.amazonaws.com/${CUDNN_NAME}.tar.xz
7+
if [[ ${CUDA_VERSION:0:4} == "12.1" ]]; then
8+
CUDNN_NAME="cudnn-linux-x86_64-8.8.1.3_cuda12-archive"
9+
curl --retry 3 -OLs https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/c/${CUDNN_NAME}.tar.xz
1010
elif [[ ${CUDA_VERSION:0:4} == "11.8" ]]; then
1111
CUDNN_NAME="cudnn-linux-x86_64-8.7.0.84_cuda11-archive"
1212
curl --retry 3 -OLs https://developer.download.nvidia.com/compute/redist/cudnn/v8.7.0/local_installers/11.8/${CUDNN_NAME}.tar.xz

‎.ci/docker/common/install_vision.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,6 @@ case "$ID" in
4343
exit 1
4444
;;
4545
esac
46+
47+
# Cache vision models used by the test
48+
source "$(dirname "${BASH_SOURCE[0]}")/cache_vision_models.sh"

‎.ci/docker/requirements-ci.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ mypy==0.960
8181
#Pinned versions: 0.960
8282
#test that import: test_typing.py, test_type_hints.py
8383

84-
networkx==2.6.3
84+
networkx==2.8.8
8585
#Description: creation, manipulation, and study of
8686
#the structure, dynamics, and functions of complex networks
87-
#Pinned versions: 2.6.3 (latest version that works with Python 3.7+)
87+
#Pinned versions: 2.8.8
8888
#test that import: functorch
8989

9090
#ninja
@@ -199,7 +199,8 @@ pygments==2.12.0
199199
#Pinned versions: 10.9.0
200200
#test that import:
201201

202-
scikit-image
202+
scikit-image==0.19.3 ; python_version < "3.10"
203+
scikit-image==0.20.0 ; python_version >= "3.10"
203204
#Description: image processing routines
204205
#Pinned versions:
205206
#test that import: test_nn.py
@@ -224,7 +225,7 @@ scipy==1.9.3 ; python_version == "3.11"
224225
#Pinned versions:
225226
#test that import:
226227

227-
tb-nightly
228+
tb-nightly==2.13.0a20230426
228229
#Description: TensorBoard
229230
#Pinned versions:
230231
#test that import:

‎.ci/docker/ubuntu-cuda/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ ENV INSTALLED_DB ${DB}
5858

5959
# (optional) Install vision packages like OpenCV and ffmpeg
6060
ARG VISION
61-
COPY ./common/install_vision.sh install_vision.sh
61+
COPY ./common/install_vision.sh ./common/cache_vision_models.sh ./common/common_utils.sh ./
6262
RUN if [ -n "${VISION}" ]; then bash ./install_vision.sh; fi
63-
RUN rm install_vision.sh
63+
RUN rm install_vision.sh cache_vision_models.sh common_utils.sh
6464
ENV INSTALLED_VISION ${VISION}
6565

6666
# (optional) Install UCC
@@ -137,6 +137,7 @@ RUN rm install_cudnn.sh
137137
# Delete /usr/local/cuda-11.X/cuda-11.X symlinks
138138
RUN if [ -h /usr/local/cuda-11.6/cuda-11.6 ]; then rm /usr/local/cuda-11.6/cuda-11.6; fi
139139
RUN if [ -h /usr/local/cuda-11.7/cuda-11.7 ]; then rm /usr/local/cuda-11.7/cuda-11.7; fi
140+
RUN if [ -h /usr/local/cuda-12.1/cuda-12.1 ]; then rm /usr/local/cuda-12.1/cuda-12.1; fi
140141

141142
USER jenkins
142143
CMD ["bash"]

‎.ci/docker/ubuntu-rocm/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ ENV INSTALLED_DB ${DB}
5555

5656
# (optional) Install vision packages like OpenCV and ffmpeg
5757
ARG VISION
58-
COPY ./common/install_vision.sh install_vision.sh
58+
COPY ./common/install_vision.sh ./common/cache_vision_models.sh ./common/common_utils.sh ./
5959
RUN if [ -n "${VISION}" ]; then bash ./install_vision.sh; fi
60-
RUN rm install_vision.sh
60+
RUN rm install_vision.sh cache_vision_models.sh common_utils.sh
6161
ENV INSTALLED_VISION ${VISION}
6262

6363
# Install rocm

‎.ci/docker/ubuntu/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,20 +86,20 @@ ENV INSTALLED_DB ${DB}
8686

8787
# (optional) Install vision packages like OpenCV and ffmpeg
8888
ARG VISION
89-
COPY ./common/install_vision.sh install_vision.sh
89+
COPY ./common/install_vision.sh ./common/cache_vision_models.sh ./common/common_utils.sh ./
9090
RUN if [ -n "${VISION}" ]; then bash ./install_vision.sh; fi
91-
RUN rm install_vision.sh
91+
RUN rm install_vision.sh cache_vision_models.sh common_utils.sh
9292
ENV INSTALLED_VISION ${VISION}
9393

9494
# (optional) Install Android NDK
9595
ARG ANDROID
9696
ARG ANDROID_NDK
9797
ARG GRADLE_VERSION
98-
COPY ./common/install_android.sh install_android.sh
98+
COPY ./common/install_android.sh ./common/cache_vision_models.sh ./common/common_utils.sh ./
9999
COPY ./android/AndroidManifest.xml AndroidManifest.xml
100100
COPY ./android/build.gradle build.gradle
101101
RUN if [ -n "${ANDROID}" ]; then bash ./install_android.sh; fi
102-
RUN rm install_android.sh
102+
RUN rm install_android.sh cache_vision_models.sh common_utils.sh
103103
RUN rm AndroidManifest.xml
104104
RUN rm build.gradle
105105
ENV INSTALLED_ANDROID ${ANDROID}

0 commit comments

Comments
 (0)