diff --git a/.ci/docker/build.sh b/.ci/docker/build.sh
index d6cba6659db7..d8de42368200 100755
--- a/.ci/docker/build.sh
+++ b/.ci/docker/build.sh
@@ -276,7 +276,7 @@ case "$tag" in
NINJA_VERSION=1.9.0
TRITON=yes
;;
- pytorch-linux-jammy-py3.9-gcc11-inductor-benchmarks)
+ pytorch-linux-jammy-py3.9-gcc11-inductor-benchmarks)
ANACONDA_PYTHON_VERSION=3.9
GCC_VERSION=11
VISION=yes
diff --git a/.github/ci_commit_pins/torchbench.txt b/.ci/docker/ci_commit_pins/torchbench.txt
similarity index 100%
rename from .github/ci_commit_pins/torchbench.txt
rename to .ci/docker/ci_commit_pins/torchbench.txt
diff --git a/.ci/docker/common/install_inductor_benchmark_deps.sh b/.ci/docker/common/install_inductor_benchmark_deps.sh
index 7312dce170db..bda3aa600956 100644
--- a/.ci/docker/common/install_inductor_benchmark_deps.sh
+++ b/.ci/docker/common/install_inductor_benchmark_deps.sh
@@ -15,11 +15,37 @@ function install_timm() {
commit=$(get_pinned_commit timm)
pip_install "git+https://github.com/huggingface/pytorch-image-models@${commit}"
- # Clean up
- conda_run pip uninstall -y torch torchvision triton
+}
+
+function install_torchbench() {
+ local commit
+ commit=$(get_pinned_commit torchbench)
+ git clone https://github.com/pytorch/benchmark torchbench
+ pushd torchbench
+ git checkout "$commit"
+
+ python install.py --continue_on_fail
+
+ # TODO (huydhn): transformers-4.44.2 added by https://github.com/pytorch/benchmark/pull/2488
+ # is regressing speedup metric. This needs to be investigated further
+ pip install transformers==4.38.1
+
+ echo "Print all dependencies after TorchBench is installed"
+ python -mpip freeze
+ popd
+
+ chown -R jenkins torchbench
}
# Pango is needed for weasyprint which is needed for doctr
conda_install pango
+
+# Stable packages are ok here, just to satisfy TorchBench check
+pip_install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu128
+
+install_torchbench
install_huggingface
install_timm
+
+# Clean up
+conda_run pip uninstall -y torch torchvision torchaudio triton
diff --git a/.ci/docker/requirements-ci.txt b/.ci/docker/requirements-ci.txt
index fb773ff324af..944b1fb35b36 100644
--- a/.ci/docker/requirements-ci.txt
+++ b/.ci/docker/requirements-ci.txt
@@ -361,7 +361,6 @@ pwlf==2.2.1
#Pinned versions: 2.2.1
#test that import: test_sac_estimator.py
-
# To build PyTorch itself
pyyaml
pyzstd
diff --git a/.ci/docker/ubuntu-rocm/Dockerfile b/.ci/docker/ubuntu-rocm/Dockerfile
index 2528da07c69e..8f2cc6eef958 100644
--- a/.ci/docker/ubuntu-rocm/Dockerfile
+++ b/.ci/docker/ubuntu-rocm/Dockerfile
@@ -98,8 +98,9 @@ COPY ./common/install_inductor_benchmark_deps.sh install_inductor_benchmark_deps
COPY ./common/common_utils.sh common_utils.sh
COPY ci_commit_pins/huggingface.txt huggingface.txt
COPY ci_commit_pins/timm.txt timm.txt
+COPY ci_commit_pins/torchbench.txt torchbench.txt
RUN if [ -n "${INDUCTOR_BENCHMARKS}" ]; then bash ./install_inductor_benchmark_deps.sh; fi
-RUN rm install_inductor_benchmark_deps.sh common_utils.sh timm.txt huggingface.txt
+RUN rm install_inductor_benchmark_deps.sh common_utils.sh timm.txt huggingface.txt torchbench.txt
# (optional) Install non-default Ninja version
ARG NINJA_VERSION
diff --git a/.ci/docker/ubuntu/Dockerfile b/.ci/docker/ubuntu/Dockerfile
index 27c466dd8d41..077910cef9f3 100644
--- a/.ci/docker/ubuntu/Dockerfile
+++ b/.ci/docker/ubuntu/Dockerfile
@@ -98,8 +98,9 @@ COPY ./common/install_inductor_benchmark_deps.sh install_inductor_benchmark_deps
COPY ./common/common_utils.sh common_utils.sh
COPY ci_commit_pins/huggingface.txt huggingface.txt
COPY ci_commit_pins/timm.txt timm.txt
+COPY ci_commit_pins/torchbench.txt torchbench.txt
RUN if [ -n "${INDUCTOR_BENCHMARKS}" ]; then bash ./install_inductor_benchmark_deps.sh; fi
-RUN rm install_inductor_benchmark_deps.sh common_utils.sh timm.txt huggingface.txt
+RUN rm install_inductor_benchmark_deps.sh common_utils.sh timm.txt huggingface.txt torchbench.txt
ARG TRITON
ARG TRITON_CPU
diff --git a/.ci/pytorch/common_utils.sh b/.ci/pytorch/common_utils.sh
index e9c7741947cf..f0bb2a63ae74 100644
--- a/.ci/pytorch/common_utils.sh
+++ b/.ci/pytorch/common_utils.sh
@@ -229,7 +229,6 @@ function install_torchrec_and_fbgemm() {
pip_install tabulate # needed for newer fbgemm
pip_install patchelf # needed for rocm fbgemm
- pushd /tmp
local wheel_dir=dist/fbgemm_gpu
local found_whl=0
@@ -264,7 +263,6 @@ function install_torchrec_and_fbgemm() {
done
rm -rf fbgemm
- popd
else
pip_build_and_install "git+https://github.com/pytorch/torchrec.git@${torchrec_commit}" dist/torchrec
pip_build_and_install "git+https://github.com/pytorch/FBGEMM.git@${fbgemm_commit}#subdirectory=fbgemm_gpu" dist/fbgemm_gpu
@@ -283,30 +281,6 @@ function clone_pytorch_xla() {
fi
}
-function checkout_install_torchbench() {
- local commit
- commit=$(get_pinned_commit torchbench)
- git clone https://github.com/pytorch/benchmark torchbench
- pushd torchbench
- git checkout "$commit"
-
- if [ "$1" ]; then
- python install.py --continue_on_fail models "$@"
- else
- # Occasionally the installation may fail on one model but it is ok to continue
- # to install and test other models
- python install.py --continue_on_fail
- fi
-
- # TODO (huydhn): transformers-4.44.2 added by https://github.com/pytorch/benchmark/pull/2488
- # is regressing speedup metric. This needs to be investigated further
- pip install transformers==4.38.1
-
- echo "Print all dependencies after TorchBench is installed"
- python -mpip freeze
- popd
-}
-
function install_torchao() {
local commit
commit=$(get_pinned_commit torchao)
diff --git a/.ci/pytorch/test.sh b/.ci/pytorch/test.sh
index b16557061d11..df5b0172574b 100755
--- a/.ci/pytorch/test.sh
+++ b/.ci/pytorch/test.sh
@@ -1674,13 +1674,11 @@ elif [[ "${TEST_CONFIG}" == *timm* ]]; then
elif [[ "${TEST_CONFIG}" == cachebench ]]; then
install_torchaudio
install_torchvision
- checkout_install_torchbench nanogpt BERT_pytorch resnet50 hf_T5 llama moco
- PYTHONPATH=$(pwd)/torchbench test_cachebench
+ PYTHONPATH=/torchbench test_cachebench
elif [[ "${TEST_CONFIG}" == verify_cachebench ]]; then
install_torchaudio
install_torchvision
- checkout_install_torchbench nanogpt
- PYTHONPATH=$(pwd)/torchbench test_verify_cachebench
+ PYTHONPATH=/torchbench test_verify_cachebench
elif [[ "${TEST_CONFIG}" == *torchbench* ]]; then
install_torchaudio
install_torchvision
@@ -1689,28 +1687,22 @@ elif [[ "${TEST_CONFIG}" == *torchbench* ]]; then
# https://github.com/opencv/opencv-python/issues/885
pip_install opencv-python==4.8.0.74
if [[ "${TEST_CONFIG}" == *inductor_torchbench_smoketest_perf* ]]; then
- checkout_install_torchbench hf_Bert hf_Albert timm_vision_transformer
- PYTHONPATH=$(pwd)/torchbench test_inductor_torchbench_smoketest_perf
+ PYTHONPATH=/torchbench test_inductor_torchbench_smoketest_perf
elif [[ "${TEST_CONFIG}" == *inductor_torchbench_cpu_smoketest_perf* ]]; then
- checkout_install_torchbench timm_vision_transformer phlippe_densenet basic_gnn_edgecnn \
- llama_v2_7b_16h resnet50 timm_efficientnet mobilenet_v3_large timm_resnest \
- functorch_maml_omniglot yolov3 mobilenet_v2 resnext50_32x4d densenet121 mnasnet1_0
- PYTHONPATH=$(pwd)/torchbench test_inductor_torchbench_cpu_smoketest_perf
+ PYTHONPATH=/torchbench test_inductor_torchbench_cpu_smoketest_perf
elif [[ "${TEST_CONFIG}" == *torchbench_gcp_smoketest* ]]; then
- checkout_install_torchbench
- TORCHBENCHPATH=$(pwd)/torchbench test_torchbench_gcp_smoketest
+ TORCHBENCHPATH=/torchbench test_torchbench_gcp_smoketest
else
- checkout_install_torchbench
# Do this after checkout_install_torchbench to ensure we clobber any
# nightlies that torchbench may pull in
if [[ "${TEST_CONFIG}" != *cpu* ]]; then
install_torchrec_and_fbgemm
fi
- PYTHONPATH=$(pwd)/torchbench test_dynamo_benchmark torchbench "$id"
+ PYTHONPATH=/torchbench test_dynamo_benchmark torchbench "$id"
fi
elif [[ "${TEST_CONFIG}" == *inductor_cpp_wrapper* ]]; then
install_torchvision
- PYTHONPATH=$(pwd)/torchbench test_inductor_cpp_wrapper_shard "$SHARD_NUMBER"
+ PYTHONPATH=/torchbench test_inductor_cpp_wrapper_shard "$SHARD_NUMBER"
if [[ "$SHARD_NUMBER" -eq "1" ]]; then
test_inductor_aoti
fi
diff --git a/.github/workflows/trunk.yml b/.github/workflows/trunk.yml
index 261c95c507bb..b9c8325c0c48 100644
--- a/.github/workflows/trunk.yml
+++ b/.github/workflows/trunk.yml
@@ -206,7 +206,7 @@ jobs:
with:
runner_prefix: "${{ needs.get-label-type.outputs.label-type }}"
build-environment: linux-jammy-py3.9-gcc11
- docker-image-name: ci-image:pytorch-linux-jammy-py3.9-gcc11
+ docker-image-name: ci-image:pytorch-linux-jammy-py3.9-gcc11-inductor-benchmarks
test-matrix: |
{ include: [
{ config: "verify_cachebench", shard: 1, num_shards: 1, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy