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 561b419297f..9cee3bfc26d 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 }} @@ -33,7 +33,6 @@ jobs: export PYTHON_VERSION=3.9 export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }} export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }} - ./.github/scripts/cmake.sh macos: 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