From aedbcbdccbca4a158a2be3ec0104f4a5f273bbf2 Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 12 Nov 2024 10:28:50 -0800 Subject: [PATCH 01/17] Migrate towards linux_job_v2.yml typo --- .github/workflows/build-cmake.yml | 2 +- .github/workflows/docs.yml | 6 +++--- .github/workflows/lint.yml | 6 +++--- .github/workflows/prototype-tests-linux-gpu.yml | 4 ++-- .github/workflows/tests.yml | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml index 561b419297f..58cfc8da0b0 100644 --- a/.github/workflows/build-cmake.yml +++ b/.github/workflows/build-cmake.yml @@ -20,7 +20,7 @@ jobs: gpu-arch-type: cuda gpu-arch-version: "11.8" fail-fast: false - uses: pytorch/test-infra/.github/workflows/linux_job.yml@main + uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main with: repository: pytorch/vision runner: ${{ matrix.runner }} diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 4899b81c956..f6ec4201da3 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,7 @@ on: jobs: build: - uses: pytorch/test-infra/.github/workflows/linux_job.yml@main + uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main with: repository: pytorch/vision upload-artifact: docs @@ -77,11 +77,11 @@ jobs: upload: needs: build - if: github.repository == 'pytorch/vision' && github.event_name == 'push' && + if: github.repository == 'pytorch/vision' && github.event_name == 'push' && ((github.ref_type == 'branch' && github.ref_name == 'main') || github.ref_type == 'tag') permissions: contents: write - uses: pytorch/test-infra/.github/workflows/linux_job.yml@main + uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main with: repository: pytorch/vision download-artifact: docs diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index eac1c009eec..7e9943668cd 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -11,7 +11,7 @@ on: jobs: python-source-and-configs: - uses: pytorch/test-infra/.github/workflows/linux_job.yml@main + uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main with: repository: pytorch/vision test-infra-ref: main @@ -38,7 +38,7 @@ jobs: fi c-source: - uses: pytorch/test-infra/.github/workflows/linux_job.yml@main + uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main with: repository: pytorch/vision test-infra-ref: main @@ -65,7 +65,7 @@ jobs: python-types: - uses: pytorch/test-infra/.github/workflows/linux_job.yml@main + uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main with: repository: pytorch/vision test-infra-ref: main diff --git a/.github/workflows/prototype-tests-linux-gpu.yml b/.github/workflows/prototype-tests-linux-gpu.yml index 7fbe77ca146..e1d6498761b 100644 --- a/.github/workflows/prototype-tests-linux-gpu.yml +++ b/.github/workflows/prototype-tests-linux-gpu.yml @@ -23,7 +23,7 @@ jobs: gpu-arch-type: cuda gpu-arch-version: "11.8" fail-fast: false - uses: pytorch/test-infra/.github/workflows/linux_job.yml@main + uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main with: repository: pytorch/vision runner: ${{ matrix.runner }} @@ -37,7 +37,7 @@ jobs: export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }} export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }} ./.github/scripts/setup-env.sh - + # Prepare conda CONDA_PATH=$(which conda) eval "$(${CONDA_PATH} shell.bash hook)" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6f03b0a59eb..b4a74733967 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,7 +26,7 @@ jobs: gpu-arch-type: cuda gpu-arch-version: "11.8" fail-fast: false - uses: pytorch/test-infra/.github/workflows/linux_job.yml@main + uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main with: repository: pytorch/vision runner: ${{ matrix.runner }} @@ -104,7 +104,7 @@ jobs: ./.github/scripts/unittest.sh onnx: - uses: pytorch/test-infra/.github/workflows/linux_job.yml@main + uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main with: repository: pytorch/vision test-infra-ref: main @@ -135,7 +135,7 @@ jobs: echo '::endgroup::' unittests-extended: - uses: pytorch/test-infra/.github/workflows/linux_job.yml@main + uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main if: contains(github.event.pull_request.labels.*.name, 'run-extended') with: repository: pytorch/vision From 35fb39f365461699027c899ed1c021f12ba62309 Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 12 Nov 2024 19:28:19 -0800 Subject: [PATCH 02/17] tets --- .github/scripts/cmake.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/scripts/cmake.sh b/.github/scripts/cmake.sh index bc49c80a309..e711c4f04e8 100755 --- a/.github/scripts/cmake.sh +++ b/.github/scripts/cmake.sh @@ -46,6 +46,9 @@ fi echo '::group::Prepare CMake builds' mkdir -p cpp_build +ldd /opt/conda/envs/ci/lib/python3.9/site-packages/torchvision/image.so +ldd /opt/conda/envs/ci/lib/python3.9/site-packages/torch/lib/libtorch_cpu.so + pushd examples/cpp python script_model.py mkdir -p build From 6c17bfeabe5a12f019f8c393bc133bf978c416ef Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 12 Nov 2024 19:37:47 -0800 Subject: [PATCH 03/17] test1 --- .github/scripts/cmake.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/scripts/cmake.sh b/.github/scripts/cmake.sh index e711c4f04e8..bc855862983 100755 --- a/.github/scripts/cmake.sh +++ b/.github/scripts/cmake.sh @@ -46,8 +46,11 @@ fi echo '::group::Prepare CMake builds' mkdir -p cpp_build -ldd /opt/conda/envs/ci/lib/python3.9/site-packages/torchvision/image.so +python +TORCHVISION_PATH=$(python -c "import pathlib, torch, torchvision; print(pathlib.Path(torchvision.__path__[0]))") ldd /opt/conda/envs/ci/lib/python3.9/site-packages/torch/lib/libtorch_cpu.so +ldd "${TORCHVISION_PATH}/image.so" + pushd examples/cpp python script_model.py From 85fe85414b1a8fcd4d66e3b673a4942f90203b5e Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 12 Nov 2024 19:51:39 -0800 Subject: [PATCH 04/17] test1 --- .github/scripts/cmake.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/scripts/cmake.sh b/.github/scripts/cmake.sh index bc855862983..4da825805ab 100755 --- a/.github/scripts/cmake.sh +++ b/.github/scripts/cmake.sh @@ -46,7 +46,6 @@ fi echo '::group::Prepare CMake builds' mkdir -p cpp_build -python TORCHVISION_PATH=$(python -c "import pathlib, torch, torchvision; print(pathlib.Path(torchvision.__path__[0]))") ldd /opt/conda/envs/ci/lib/python3.9/site-packages/torch/lib/libtorch_cpu.so ldd "${TORCHVISION_PATH}/image.so" From 652d240f35b2c786aa4c28b64128e3380d01c375 Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 12 Nov 2024 20:16:55 -0800 Subject: [PATCH 05/17] tets --- .github/scripts/cmake.sh | 5 ----- .github/workflows/build-cmake.yml | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/scripts/cmake.sh b/.github/scripts/cmake.sh index 4da825805ab..bc49c80a309 100755 --- a/.github/scripts/cmake.sh +++ b/.github/scripts/cmake.sh @@ -46,11 +46,6 @@ fi echo '::group::Prepare CMake builds' mkdir -p cpp_build -TORCHVISION_PATH=$(python -c "import pathlib, torch, torchvision; print(pathlib.Path(torchvision.__path__[0]))") -ldd /opt/conda/envs/ci/lib/python3.9/site-packages/torch/lib/libtorch_cpu.so -ldd "${TORCHVISION_PATH}/image.so" - - pushd examples/cpp python script_model.py mkdir -p build diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml index 58cfc8da0b0..41a07b733d7 100644 --- a/.github/workflows/build-cmake.yml +++ b/.github/workflows/build-cmake.yml @@ -34,6 +34,9 @@ jobs: export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }} export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }} + #install torch built with manylinux 2.28 + pip install --progress-bar=off --pre torch==2.6.0.dev20241106 --index-url=https://download.pytorch.org/whl/nightly/cpu --force-reinstall + ./.github/scripts/cmake.sh macos: From 08c79e5e68a8569c9f55e0cd11e8dcada6aaf81a Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 12 Nov 2024 20:23:36 -0800 Subject: [PATCH 06/17] test --- .github/scripts/setup-env.sh | 5 ++++- .github/workflows/build-cmake.yml | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/scripts/setup-env.sh b/.github/scripts/setup-env.sh index adb1256303f..2f13a1c9fe1 100755 --- a/.github/scripts/setup-env.sh +++ b/.github/scripts/setup-env.sh @@ -77,7 +77,10 @@ case $GPU_ARCH_TYPE in ;; esac PYTORCH_WHEEL_INDEX="https://download.pytorch.org/whl/${CHANNEL}/${GPU_ARCH_ID}" -pip install --progress-bar=off --pre torch --index-url="${PYTORCH_WHEEL_INDEX}" +#pip install --progress-bar=off --pre torch --index-url="${PYTORCH_WHEEL_INDEX}" + +#install torch built with manylinux 2.28 +pip install --progress-bar=off --pre torch==2.6.0.dev20241106 --index-url=https://download.pytorch.org/whl/nightly/cpu --force-reinstall if [[ $GPU_ARCH_TYPE == 'cuda' ]]; then python -c "import torch; exit(not torch.cuda.is_available())" diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml index 41a07b733d7..9cee3bfc26d 100644 --- a/.github/workflows/build-cmake.yml +++ b/.github/workflows/build-cmake.yml @@ -33,10 +33,6 @@ jobs: export PYTHON_VERSION=3.9 export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }} export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }} - - #install torch built with manylinux 2.28 - pip install --progress-bar=off --pre torch==2.6.0.dev20241106 --index-url=https://download.pytorch.org/whl/nightly/cpu --force-reinstall - ./.github/scripts/cmake.sh macos: From c2a29fc32758523304e46478f05c612ae7f5a32b Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 13 Nov 2024 04:48:27 -0800 Subject: [PATCH 07/17] test --- .github/scripts/cmake.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/scripts/cmake.sh b/.github/scripts/cmake.sh index bc49c80a309..43a3c74729d 100755 --- a/.github/scripts/cmake.sh +++ b/.github/scripts/cmake.sh @@ -83,6 +83,9 @@ echo '::endgroup::' echo '::group::Build and run C++ example' pushd examples/cpp/build +ls -las /opt/conda/envs/ci/lib/ +ldd /opt/conda/envs/ci/lib/libpng.so + cmake .. -DTorch_DIR="${Torch_DIR}" \ -DCMAKE_PREFIX_PATH="${CONDA_PREFIX}" \ -DCMAKE_FIND_FRAMEWORK=NEVER \ From f72ef83597cb212718aa5b24c26654f25f015e0b Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 13 Nov 2024 05:02:24 -0800 Subject: [PATCH 08/17] test1 --- .github/scripts/cmake.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/scripts/cmake.sh b/.github/scripts/cmake.sh index 43a3c74729d..f622d6dc7dc 100755 --- a/.github/scripts/cmake.sh +++ b/.github/scripts/cmake.sh @@ -85,6 +85,7 @@ pushd examples/cpp/build ls -las /opt/conda/envs/ci/lib/ ldd /opt/conda/envs/ci/lib/libpng.so +ldconfig -p | grep libpng cmake .. -DTorch_DIR="${Torch_DIR}" \ -DCMAKE_PREFIX_PATH="${CONDA_PREFIX}" \ From 153a7e6ba6b61b36063715cbae15967bf605be5f Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 13 Nov 2024 05:10:18 -0800 Subject: [PATCH 09/17] test --- .github/scripts/cmake.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/scripts/cmake.sh b/.github/scripts/cmake.sh index f622d6dc7dc..115012b158a 100755 --- a/.github/scripts/cmake.sh +++ b/.github/scripts/cmake.sh @@ -83,9 +83,8 @@ echo '::endgroup::' echo '::group::Build and run C++ example' pushd examples/cpp/build -ls -las /opt/conda/envs/ci/lib/ -ldd /opt/conda/envs/ci/lib/libpng.so -ldconfig -p | grep libpng +PATH="/opt/conda/envs/ci/lib/:${PATH}" +ldd /opt/conda/envs/ci/lib/libpng16.so.16 cmake .. -DTorch_DIR="${Torch_DIR}" \ -DCMAKE_PREFIX_PATH="${CONDA_PREFIX}" \ From 4cb19f5f38f947550dd7a3694b94fc6439b2d78f Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 13 Nov 2024 05:17:06 -0800 Subject: [PATCH 10/17] test --- .github/scripts/cmake.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/cmake.sh b/.github/scripts/cmake.sh index 115012b158a..875a38aee51 100755 --- a/.github/scripts/cmake.sh +++ b/.github/scripts/cmake.sh @@ -83,7 +83,7 @@ echo '::endgroup::' echo '::group::Build and run C++ example' pushd examples/cpp/build -PATH="/opt/conda/envs/ci/lib/:${PATH}" +LD_LIBRARY_PATH="/opt/conda/envs/ci/lib/:${LD_LIBRARY_PATH}" ldd /opt/conda/envs/ci/lib/libpng16.so.16 cmake .. -DTorch_DIR="${Torch_DIR}" \ From 32314ece8bc68f85c5b189c750d9c4c6fb63a38c Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 13 Nov 2024 05:55:48 -0800 Subject: [PATCH 11/17] fix --- .github/scripts/cmake.sh | 5 ++--- .github/scripts/setup-env.sh | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/scripts/cmake.sh b/.github/scripts/cmake.sh index 875a38aee51..e0e9d501ed2 100755 --- a/.github/scripts/cmake.sh +++ b/.github/scripts/cmake.sh @@ -42,6 +42,8 @@ if [[ "${GPU_ARCH_TYPE}" == "cuda" ]]; then else WITH_CUDA=0 fi +# Not sure why its needed +LD_LIBRARY_PATH="/opt/conda/envs/ci/lib/:${LD_LIBRARY_PATH}" echo '::group::Prepare CMake builds' mkdir -p cpp_build @@ -83,9 +85,6 @@ echo '::endgroup::' echo '::group::Build and run C++ example' pushd examples/cpp/build -LD_LIBRARY_PATH="/opt/conda/envs/ci/lib/:${LD_LIBRARY_PATH}" -ldd /opt/conda/envs/ci/lib/libpng16.so.16 - cmake .. -DTorch_DIR="${Torch_DIR}" \ -DCMAKE_PREFIX_PATH="${CONDA_PREFIX}" \ -DCMAKE_FIND_FRAMEWORK=NEVER \ diff --git a/.github/scripts/setup-env.sh b/.github/scripts/setup-env.sh index 2f13a1c9fe1..182db72afd0 100755 --- a/.github/scripts/setup-env.sh +++ b/.github/scripts/setup-env.sh @@ -31,6 +31,7 @@ conda create \ ninja cmake \ libpng \ libwebp \ + numpy \ 'ffmpeg<4.3' conda activate ci conda install --quiet --yes libjpeg-turbo -c pytorch From 44e2f458fe79b4735a72a0b3b08032490006502e Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 13 Nov 2024 06:19:26 -0800 Subject: [PATCH 12/17] test --- .github/scripts/cmake.sh | 2 -- .github/scripts/setup-env.sh | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/scripts/cmake.sh b/.github/scripts/cmake.sh index e0e9d501ed2..bc49c80a309 100755 --- a/.github/scripts/cmake.sh +++ b/.github/scripts/cmake.sh @@ -42,8 +42,6 @@ if [[ "${GPU_ARCH_TYPE}" == "cuda" ]]; then else WITH_CUDA=0 fi -# Not sure why its needed -LD_LIBRARY_PATH="/opt/conda/envs/ci/lib/:${LD_LIBRARY_PATH}" echo '::group::Prepare CMake builds' mkdir -p cpp_build diff --git a/.github/scripts/setup-env.sh b/.github/scripts/setup-env.sh index 182db72afd0..57a9d644b35 100755 --- a/.github/scripts/setup-env.sh +++ b/.github/scripts/setup-env.sh @@ -37,6 +37,9 @@ conda activate ci conda install --quiet --yes libjpeg-turbo -c pytorch pip install --progress-bar=off --upgrade setuptools==72.1.0 +# set ld_library_path - make sure so libraries are loaded from there +export LD_LIBRARY_PATH="${CONDA_PREFIX}/lib:${LD_LIBRARY_PATH}" + # See https://github.com/pytorch/vision/issues/6790 if [[ "${PYTHON_VERSION}" != "3.11" ]]; then pip install --progress-bar=off av!=10.0.0 @@ -81,7 +84,7 @@ PYTORCH_WHEEL_INDEX="https://download.pytorch.org/whl/${CHANNEL}/${GPU_ARCH_ID}" #pip install --progress-bar=off --pre torch --index-url="${PYTORCH_WHEEL_INDEX}" #install torch built with manylinux 2.28 -pip install --progress-bar=off --pre torch==2.6.0.dev20241106 --index-url=https://download.pytorch.org/whl/nightly/cpu --force-reinstall +pip install --progress-bar=off --pre torch==2.6.0.dev20241106 --index-url="${PYTORCH_WHEEL_INDEX}" --force-reinstall if [[ $GPU_ARCH_TYPE == 'cuda' ]]; then python -c "import torch; exit(not torch.cuda.is_available())" From f2cfe40cfecdc5b2e469c399ffe6a775cf84f35d Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 13 Nov 2024 06:22:53 -0800 Subject: [PATCH 13/17] test --- .github/scripts/setup-env.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/scripts/setup-env.sh b/.github/scripts/setup-env.sh index 57a9d644b35..0d051f6a767 100755 --- a/.github/scripts/setup-env.sh +++ b/.github/scripts/setup-env.sh @@ -37,8 +37,10 @@ conda activate ci conda install --quiet --yes libjpeg-turbo -c pytorch pip install --progress-bar=off --upgrade setuptools==72.1.0 -# set ld_library_path - make sure so libraries are loaded from there -export LD_LIBRARY_PATH="${CONDA_PREFIX}/lib:${LD_LIBRARY_PATH}" +# set ld_library_path - make sure so libraries have precedence +if [[ "${OS_TYPE}" == linux ]]; then + export LD_LIBRARY_PATH="${CONDA_PREFIX}/lib:${LD_LIBRARY_PATH}" +fi # See https://github.com/pytorch/vision/issues/6790 if [[ "${PYTHON_VERSION}" != "3.11" ]]; then From 08fa4b76bce97921165055fbf84b434088d34ad0 Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 13 Nov 2024 06:35:08 -0800 Subject: [PATCH 14/17] test --- .github/scripts/setup-env.sh | 4 ---- .github/workflows/build-cmake.yml | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/scripts/setup-env.sh b/.github/scripts/setup-env.sh index 0d051f6a767..ae3b9de555c 100755 --- a/.github/scripts/setup-env.sh +++ b/.github/scripts/setup-env.sh @@ -37,10 +37,6 @@ conda activate ci conda install --quiet --yes libjpeg-turbo -c pytorch pip install --progress-bar=off --upgrade setuptools==72.1.0 -# set ld_library_path - make sure so libraries have precedence -if [[ "${OS_TYPE}" == linux ]]; then - export LD_LIBRARY_PATH="${CONDA_PREFIX}/lib:${LD_LIBRARY_PATH}" -fi # See https://github.com/pytorch/vision/issues/6790 if [[ "${PYTHON_VERSION}" != "3.11" ]]; then diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml index 9cee3bfc26d..4006c423dae 100644 --- a/.github/workflows/build-cmake.yml +++ b/.github/workflows/build-cmake.yml @@ -33,6 +33,11 @@ jobs: export PYTHON_VERSION=3.9 export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }} export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }} + # Prepare conda + CONDA_PATH=$(which conda) + eval "$(${CONDA_PATH} shell.bash hook)" + conda activate ci + export LD_LIBRARY_PATH="${CONDA_PREFIX}/lib:${LD_LIBRARY_PATH}" ./.github/scripts/cmake.sh macos: From 6e2ef6f27af93231b0b34e0d1de2b965f8c82d3f Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 13 Nov 2024 06:42:47 -0800 Subject: [PATCH 15/17] one_more_fix --- .github/scripts/cmake.sh | 4 ++++ .github/workflows/build-cmake.yml | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/scripts/cmake.sh b/.github/scripts/cmake.sh index bc49c80a309..4217a9d24be 100755 --- a/.github/scripts/cmake.sh +++ b/.github/scripts/cmake.sh @@ -30,6 +30,10 @@ else JOBS=$(nproc) fi +if [[ $OS_TYPE == linux ]]; then + export LD_LIBRARY_PATH="${CONDA_PREFIX}/lib:${LD_LIBRARY_PATH}" +fi + TORCH_PATH=$(python -c "import pathlib, torch; print(pathlib.Path(torch.__path__[0]))") if [[ $OS_TYPE == windows ]]; then PACKAGING_DIR="${PWD}/packaging" diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml index 4006c423dae..9cee3bfc26d 100644 --- a/.github/workflows/build-cmake.yml +++ b/.github/workflows/build-cmake.yml @@ -33,11 +33,6 @@ jobs: export PYTHON_VERSION=3.9 export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }} export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }} - # Prepare conda - CONDA_PATH=$(which conda) - eval "$(${CONDA_PATH} shell.bash hook)" - conda activate ci - export LD_LIBRARY_PATH="${CONDA_PREFIX}/lib:${LD_LIBRARY_PATH}" ./.github/scripts/cmake.sh macos: From 70e8b1b578cf46bef1032572812acc67da4daa99 Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 13 Nov 2024 07:11:09 -0800 Subject: [PATCH 16/17] remove_numpy --- .github/scripts/setup-env.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/scripts/setup-env.sh b/.github/scripts/setup-env.sh index ae3b9de555c..0d962d154f2 100755 --- a/.github/scripts/setup-env.sh +++ b/.github/scripts/setup-env.sh @@ -31,7 +31,6 @@ conda create \ ninja cmake \ libpng \ libwebp \ - numpy \ 'ffmpeg<4.3' conda activate ci conda install --quiet --yes libjpeg-turbo -c pytorch From 7ddac90351adbcc1f992b9df6073a0e5ddd7ee14 Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 13 Nov 2024 17:58:04 -0800 Subject: [PATCH 17/17] remove_pinned --- .github/scripts/setup-env.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/scripts/setup-env.sh b/.github/scripts/setup-env.sh index 0d962d154f2..adb1256303f 100755 --- a/.github/scripts/setup-env.sh +++ b/.github/scripts/setup-env.sh @@ -36,7 +36,6 @@ conda activate ci conda install --quiet --yes libjpeg-turbo -c pytorch pip install --progress-bar=off --upgrade setuptools==72.1.0 - # See https://github.com/pytorch/vision/issues/6790 if [[ "${PYTHON_VERSION}" != "3.11" ]]; then pip install --progress-bar=off av!=10.0.0 @@ -78,10 +77,7 @@ case $GPU_ARCH_TYPE in ;; esac PYTORCH_WHEEL_INDEX="https://download.pytorch.org/whl/${CHANNEL}/${GPU_ARCH_ID}" -#pip install --progress-bar=off --pre torch --index-url="${PYTORCH_WHEEL_INDEX}" - -#install torch built with manylinux 2.28 -pip install --progress-bar=off --pre torch==2.6.0.dev20241106 --index-url="${PYTORCH_WHEEL_INDEX}" --force-reinstall +pip install --progress-bar=off --pre torch --index-url="${PYTORCH_WHEEL_INDEX}" if [[ $GPU_ARCH_TYPE == 'cuda' ]]; then python -c "import torch; exit(not torch.cuda.is_available())"