testing

Author: atalman

.github/workflows/validate-binaries.yml

@@ -21,7 +21,7 @@ on:
     inputs:
       os:
         description: "Operating system to generate for (linux, windows, macos, macos-arm64)"
-        required: false
+        required: true
         type: choice
         default: all
         options:
@@ -31,21 +31,14 @@ on:
           - all
       channel:
         description: "Channel to use (nightly, test, release, all)"
-        required: false
+        required: true
         type: choice
         default: all
         options:
           - release
           - nightly
           - test
           - all
-  pull_request:
-    paths:
-      - .github/workflows/validate-nightly-binaries.yml
-      - .github/workflows/validate-linux-binaries.yml
-      - .github/workflows/validate-windows-binaries.yml
-      - .github/workflows/validate-macos-binaries.yml
-      - test/smoke_test/*
 
 jobs:
   win:

.github/workflows/validate-nightly-binaries.yml

@@ -16,7 +16,13 @@ on:
       - .github/workflows/validate-windows-binaries.yml
       - .github/workflows/validate-macos-binaries.yml
       - test/smoke_test/*
-
+  pull_request:
+    paths:
+      - .github/workflows/validate-nightly-binaries.yml
+      - .github/workflows/validate-linux-binaries.yml
+      - .github/workflows/validate-windows-binaries.yml
+      - .github/workflows/validate-macos-binaries.yml
+      - test/smoke_test/*
 
 jobs:
   nightly:

.github/workflows/validate-windows-binaries.yml

@@ -22,29 +22,17 @@ on:
           - all
 
 jobs:
-  generate-windows-conda-matrix:
+  generate-windows-matrix:
     uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
     with:
-      package-type: conda
-      os: windows
-      channel: ${{ inputs.channel }}
-  generate-windows-wheel-matrix:
-    uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
-    with:
-      package-type: wheel
-      os: windows
-      channel: ${{ inputs.channel }}
-  generate-windows-libtorch-matrix:
-    uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
-    with:
-      package-type: libtorch
+      package-type: all
       os: windows
       channel: ${{ inputs.channel }}
 
-  win-conda:
-    needs: generate-windows-conda-matrix
+  win:
+    needs: generate-windows-matrix
     strategy:
-      matrix: ${{ fromJson(needs.generate-windows-conda-matrix.outputs.matrix) }}
+      matrix: ${{ fromJson(needs.generate-windows-matrix.outputs.matrix) }}
       fail-fast: false
     uses: pytorch/test-infra/.github/workflows/windows_job.yml@main
     with:
@@ -57,29 +45,14 @@ jobs:
         export GPU_ARCH_VER="${{ matrix.gpu_arch_version }}"
         export GPU_ARCH_TYPE="${{ matrix.gpu_arch_type }}"
         export INSTALLATION="${{ matrix.installation }}"
-        export CUDA_VER="${{ inputs.desired_cuda }}"
-        conda create -y -n ${ENV_NAME} python=${{ matrix.python_version }} numpy pillow
-        conda activate ${ENV_NAME}
-        eval $INSTALLATION
-        python ./test/smoke_test/smoke_test.py
+        export CUDA_VER="${{ matrix.desired_cuda }}"
 
-  win-wheel:
-    needs: generate-windows-wheel-matrix
-    uses: ./.github/workflows/validate-windows-binary.yml
-    name: win-wheel
-    with:
-      test-matrix: ${{ needs.generate-windows-wheel-matrix.outputs.matrix }}
-
-  win-libt:
-    needs: generate-windows-libtorch-matrix
-    strategy:
-      matrix:
-        ${{ fromJson(needs.generate-windows-libtorch-matrix.outputs.matrix) }}
-      fail-fast: false
-    uses: pytorch/test-infra/.github/workflows/windows_job.yml@main
-    with:
-      job-name: ${{ inputs.build_name }}
-      script: |
-        set -ex
-        curl ${{ matrix.installation }} -o libtorch.zip
-        unzip libtorch.zip
+        if [[ ${{ matrix.package_type }} == "libtorch" ]]; then
+          curl ${{ matrix.installation }} -o libtorch.zip
+          unzip libtorch.zip
+        else
+          conda create -y -n ${ENV_NAME} python=${{ matrix.python_version }} numpy pillow
+          conda activate ${ENV_NAME}
+          eval $INSTALLATION
+          python ./test/smoke_test/smoke_test.py
+        fi