diff --git a/.github/workflows/build-conda-linux.yml b/.github/workflows/build-conda-linux.yml index 87dc12a010..93d3ab84fd 100644 --- a/.github/workflows/build-conda-linux.yml +++ b/.github/workflows/build-conda-linux.yml @@ -15,7 +15,7 @@ on: jobs: generate-matrix: - uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main + uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.1 with: package-type: conda os: linux @@ -35,7 +35,7 @@ jobs: smoke-test-script: test/smoke_tests/smoke_tests.py package-name: torchtext name: ${{ matrix.repository }} - uses: pytorch/test-infra/.github/workflows/build_conda_linux.yml@main + uses: pytorch/test-infra/.github/workflows/build_conda_linux.yml@release/2.1 with: conda-package-directory: ${{ matrix.conda-package-directory }} repository: ${{ matrix.repository }} @@ -52,3 +52,4 @@ jobs: trigger-event: ${{ github.event_name }} secrets: CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }} + CONDA_PYTORCHBOT_TOKEN_TEST: ${{ secrets.CONDA_PYTORCHBOT_TOKEN_TEST }} diff --git a/.github/workflows/build-conda-m1.yml b/.github/workflows/build-conda-m1.yml index 6fa7d910b0..22d859f6fd 100644 --- a/.github/workflows/build-conda-m1.yml +++ b/.github/workflows/build-conda-m1.yml @@ -15,7 +15,7 @@ on: jobs: generate-matrix: - uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main + uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.1 with: package-type: conda os: macos-arm64 @@ -34,7 +34,7 @@ jobs: smoke-test-script: test/smoke_tests/smoke_tests.py package-name: torchtext name: ${{ matrix.repository }} - uses: pytorch/test-infra/.github/workflows/build_conda_macos.yml@main + uses: pytorch/test-infra/.github/workflows/build_conda_macos.yml@release/2.1 with: conda-package-directory: ${{ matrix.conda-package-directory }} repository: ${{ matrix.repository }} @@ -52,3 +52,4 @@ jobs: trigger-event: ${{ github.event_name }} secrets: CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }} + CONDA_PYTORCHBOT_TOKEN_TEST: ${{ secrets.CONDA_PYTORCHBOT_TOKEN_TEST }} diff --git a/.github/workflows/build-conda-macos.yml b/.github/workflows/build-conda-macos.yml index f604195e08..fd90b9ebd3 100644 --- a/.github/workflows/build-conda-macos.yml +++ b/.github/workflows/build-conda-macos.yml @@ -15,7 +15,7 @@ on: jobs: generate-matrix: - uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main + uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.1 with: package-type: conda os: macos @@ -34,7 +34,7 @@ jobs: smoke-test-script: test/smoke_tests/smoke_tests.py package-name: torchtext name: ${{ matrix.repository }} - uses: pytorch/test-infra/.github/workflows/build_conda_macos.yml@main + uses: pytorch/test-infra/.github/workflows/build_conda_macos.yml@release/2.1 with: conda-package-directory: ${{ matrix.conda-package-directory }} repository: ${{ matrix.repository }} @@ -52,3 +52,4 @@ jobs: trigger-event: ${{ github.event_name }} secrets: CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }} + CONDA_PYTORCHBOT_TOKEN_TEST: ${{ secrets.CONDA_PYTORCHBOT_TOKEN_TEST }} diff --git a/.github/workflows/build-conda-windows.yml b/.github/workflows/build-conda-windows.yml index db1037574a..39fda16a59 100644 --- a/.github/workflows/build-conda-windows.yml +++ b/.github/workflows/build-conda-windows.yml @@ -15,7 +15,7 @@ on: jobs: generate-matrix: - uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main + uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.1 with: package-type: conda os: windows @@ -35,7 +35,7 @@ jobs: smoke-test-script: test/smoke_tests/smoke_tests.py package-name: torchtext name: ${{ matrix.repository }} - uses: pytorch/test-infra/.github/workflows/build_conda_windows.yml@main + uses: pytorch/test-infra/.github/workflows/build_conda_windows.yml@release/2.1 with: conda-package-directory: ${{ matrix.conda-package-directory }} repository: ${{ matrix.repository }} @@ -50,3 +50,4 @@ jobs: trigger-event: ${{ github.event_name }} secrets: CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }} + CONDA_PYTORCHBOT_TOKEN_TEST: ${{ secrets.CONDA_PYTORCHBOT_TOKEN_TEST }} diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index c7a82d0aca..716c5a7683 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-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.yml@release/2.1 with: job-name: Build doc runner: linux.2xlarge diff --git a/.github/workflows/build-wheels-linux.yml b/.github/workflows/build-wheels-linux.yml index 78d02d89b8..dfda83d0b3 100644 --- a/.github/workflows/build-wheels-linux.yml +++ b/.github/workflows/build-wheels-linux.yml @@ -15,13 +15,14 @@ on: jobs: generate-matrix: - uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main + uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.1 with: package-type: wheel os: linux test-infra-repository: pytorch/test-infra test-infra-ref: main with-cuda: disable + with-rocm: disable build: needs: generate-matrix strategy: @@ -34,7 +35,7 @@ jobs: smoke-test-script: test/smoke_tests/smoke_tests.py package-name: torchtext name: ${{ matrix.repository }} - uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main + uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@release/2.1 with: repository: ${{ matrix.repository }} ref: "" diff --git a/.github/workflows/build-wheels-m1.yml b/.github/workflows/build-wheels-m1.yml index 1b29b54e33..d4177545b1 100644 --- a/.github/workflows/build-wheels-m1.yml +++ b/.github/workflows/build-wheels-m1.yml @@ -15,7 +15,7 @@ on: jobs: generate-matrix: - uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main + uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.1 with: package-type: wheel os: macos-arm64 @@ -33,7 +33,7 @@ jobs: package-name: torchtext smoke-test-script: test/smoke_tests/smoke_tests.py name: ${{ matrix.repository }} - uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@main + uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@release/2.1 with: repository: ${{ matrix.repository }} ref: "" diff --git a/.github/workflows/build-wheels-macos.yml b/.github/workflows/build-wheels-macos.yml index 49cfb488d4..a1751bc281 100644 --- a/.github/workflows/build-wheels-macos.yml +++ b/.github/workflows/build-wheels-macos.yml @@ -15,7 +15,7 @@ on: jobs: generate-matrix: - uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main + uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.1 with: package-type: wheel os: macos @@ -33,7 +33,7 @@ jobs: package-name: torchtext smoke-test-script: test/smoke_tests/smoke_tests.py name: ${{ matrix.repository }} - uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@main + uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@release/2.1 with: repository: ${{ matrix.repository }} ref: "" diff --git a/.github/workflows/build-wheels-windows.yml b/.github/workflows/build-wheels-windows.yml index 9a43b6b4b9..95053740f8 100644 --- a/.github/workflows/build-wheels-windows.yml +++ b/.github/workflows/build-wheels-windows.yml @@ -15,7 +15,7 @@ on: jobs: generate-matrix: - uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main + uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.1 with: package-type: wheel os: windows @@ -35,7 +35,7 @@ jobs: smoke-test-script: test/smoke_tests/smoke_tests.py package-name: torchtext name: ${{ matrix.repository }} - uses: pytorch/test-infra/.github/workflows/build_wheels_windows.yml@main + uses: pytorch/test-infra/.github/workflows/build_wheels_windows.yml@release/2.1 with: repository: ${{ matrix.repository }} ref: "" diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 1e507a407f..e4fd2d32f4 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -12,7 +12,7 @@ jobs: matrix: python_version: ["3.8"] fail-fast: false - uses: pytorch/test-infra/.github/workflows/linux_job.yml@main + uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.1 with: runner: linux.12xlarge repository: pytorch/text diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 6ea3ef86a8..27afbf4fac 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.yml@release/2.1 with: repository: pytorch/text script: | @@ -41,7 +41,7 @@ jobs: echo '::endgroup::' c-source: - uses: pytorch/test-infra/.github/workflows/linux_job.yml@main + uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.1 with: repository: pytorch/text script: | diff --git a/.github/workflows/test-linux-cpu.yml b/.github/workflows/test-linux-cpu.yml index 72313f4bc2..994dcb16aa 100644 --- a/.github/workflows/test-linux-cpu.yml +++ b/.github/workflows/test-linux-cpu.yml @@ -18,7 +18,7 @@ jobs: matrix: python_version: ["3.8", "3.9", "3.10"] fail-fast: false - uses: pytorch/test-infra/.github/workflows/linux_job.yml@main + uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.1 with: runner: linux.12xlarge repository: pytorch/text diff --git a/.github/workflows/test-linux-gpu.yml b/.github/workflows/test-linux-gpu.yml index 13c12c7a2a..7a4874b13f 100644 --- a/.github/workflows/test-linux-gpu.yml +++ b/.github/workflows/test-linux-gpu.yml @@ -19,7 +19,7 @@ jobs: python_version: ["3.8"] cuda_arch_version: ["11.7"] fail-fast: false - uses: pytorch/test-infra/.github/workflows/linux_job.yml@main + uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.1 with: runner: linux.g5.4xlarge.nvidia.gpu repository: pytorch/text diff --git a/.github/workflows/test-macos-cpu.yml b/.github/workflows/test-macos-cpu.yml index 9a3d703079..bc8b9999ca 100644 --- a/.github/workflows/test-macos-cpu.yml +++ b/.github/workflows/test-macos-cpu.yml @@ -18,7 +18,7 @@ jobs: matrix: python_version: ["3.8", "3.9", "3.10"] fail-fast: false - uses: pytorch/test-infra/.github/workflows/macos_job.yml@main + uses: pytorch/test-infra/.github/workflows/macos_job.yml@release/2.1 with: runner: macos-12 repository: pytorch/text diff --git a/.github/workflows/test-windows-cpu.yml b/.github/workflows/test-windows-cpu.yml index 1b4e4884a2..757de40653 100644 --- a/.github/workflows/test-windows-cpu.yml +++ b/.github/workflows/test-windows-cpu.yml @@ -18,7 +18,7 @@ jobs: matrix: python_version: ["3.8", "3.9", "3.10"] fail-fast: false - uses: pytorch/test-infra/.github/workflows/windows_job.yml@main + uses: pytorch/test-infra/.github/workflows/windows_job.yml@release/2.1 with: runner: windows.4xlarge repository: pytorch/text diff --git a/.github/workflows/validate-binaries.yml b/.github/workflows/validate-binaries.yml index 6bebfd3fcb..e97a7e4758 100644 --- a/.github/workflows/validate-binaries.yml +++ b/.github/workflows/validate-binaries.yml @@ -45,7 +45,7 @@ on: type: string jobs: validate-binaries: - uses: pytorch/test-infra/.github/workflows/validate-domain-library.yml@main + uses: pytorch/test-infra/.github/workflows/validate-domain-library.yml@release/2.1 with: package_type: "conda,wheel" os: ${{ inputs.os }} diff --git a/packaging/install_torchdata.sh b/packaging/install_torchdata.sh index 5981a00c76..55d58ec903 100755 --- a/packaging/install_torchdata.sh +++ b/packaging/install_torchdata.sh @@ -16,7 +16,6 @@ if [ "$channel" != "nightly" ] && [ "$channel" != "test" ]; then exit 1 fi - if [ "$package_type" = "wheel" ]; then install_cmd="pip install" if [ "$channel" = "nightly" ]; then