diff --git a/.circleci/config.yml b/.circleci/config.yml index 7eba2450b18..d15a20216bb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1228,102 +1228,6 @@ workflows: cu_version: cu117 name: binary_win_wheel_py3.10_cu117 python_version: '3.10' - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cpu - cu_version: cpu - name: binary_linux_conda_py3.7_cpu - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cpu - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cuda116 - cu_version: cu116 - name: binary_linux_conda_py3.7_cu116 - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cuda116 - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cuda117 - cu_version: cu117 - name: binary_linux_conda_py3.7_cu117 - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cuda117 - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cpu - cu_version: cpu - name: binary_linux_conda_py3.8_cpu - python_version: '3.8' - wheel_docker_image: pytorch/manylinux-cpu - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cuda116 - cu_version: cu116 - name: binary_linux_conda_py3.8_cu116 - python_version: '3.8' - wheel_docker_image: pytorch/manylinux-cuda116 - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cuda117 - cu_version: cu117 - name: binary_linux_conda_py3.8_cu117 - python_version: '3.8' - wheel_docker_image: pytorch/manylinux-cuda117 - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cpu - cu_version: cpu - name: binary_linux_conda_py3.9_cpu - python_version: '3.9' - wheel_docker_image: pytorch/manylinux-cpu - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cuda116 - cu_version: cu116 - name: binary_linux_conda_py3.9_cu116 - python_version: '3.9' - wheel_docker_image: pytorch/manylinux-cuda116 - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cuda117 - cu_version: cu117 - name: binary_linux_conda_py3.9_cu117 - python_version: '3.9' - wheel_docker_image: pytorch/manylinux-cuda117 - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cpu - cu_version: cpu - name: binary_linux_conda_py3.10_cpu - python_version: '3.10' - wheel_docker_image: pytorch/manylinux-cpu - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cuda116 - cu_version: cu116 - name: binary_linux_conda_py3.10_cu116 - python_version: '3.10' - wheel_docker_image: pytorch/manylinux-cuda116 - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cuda117 - cu_version: cu117 - name: binary_linux_conda_py3.10_cu117 - python_version: '3.10' - wheel_docker_image: pytorch/manylinux-cuda117 - - binary_macos_conda: - conda_docker_image: pytorch/conda-builder:cpu - cu_version: cpu - name: binary_macos_conda_py3.7_cpu - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cpu - - binary_macos_conda: - conda_docker_image: pytorch/conda-builder:cpu - cu_version: cpu - name: binary_macos_conda_py3.8_cpu - python_version: '3.8' - wheel_docker_image: pytorch/manylinux-cpu - - binary_macos_conda: - conda_docker_image: pytorch/conda-builder:cpu - cu_version: cpu - name: binary_macos_conda_py3.9_cpu - python_version: '3.9' - wheel_docker_image: pytorch/manylinux-cpu - - binary_macos_conda: - conda_docker_image: pytorch/conda-builder:cpu - cu_version: cpu - name: binary_macos_conda_py3.10_cpu - python_version: '3.10' - wheel_docker_image: pytorch/manylinux-cpu - binary_win_conda: cu_version: cpu filters: @@ -1914,342 +1818,6 @@ workflows: requires: - nightly_binary_win_wheel_py3.10_cu117 subfolder: cu117/ - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cpu - cu_version: cpu - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.7_cpu - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cpu - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.7_cpu_upload - requires: - - nightly_binary_linux_conda_py3.7_cpu - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cuda116 - cu_version: cu116 - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.7_cu116 - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cuda116 - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.7_cu116_upload - requires: - - nightly_binary_linux_conda_py3.7_cu116 - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cuda117 - cu_version: cu117 - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.7_cu117 - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cuda117 - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.7_cu117_upload - requires: - - nightly_binary_linux_conda_py3.7_cu117 - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cpu - cu_version: cpu - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.8_cpu - python_version: '3.8' - wheel_docker_image: pytorch/manylinux-cpu - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.8_cpu_upload - requires: - - nightly_binary_linux_conda_py3.8_cpu - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cuda116 - cu_version: cu116 - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.8_cu116 - python_version: '3.8' - wheel_docker_image: pytorch/manylinux-cuda116 - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.8_cu116_upload - requires: - - nightly_binary_linux_conda_py3.8_cu116 - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cuda117 - cu_version: cu117 - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.8_cu117 - python_version: '3.8' - wheel_docker_image: pytorch/manylinux-cuda117 - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.8_cu117_upload - requires: - - nightly_binary_linux_conda_py3.8_cu117 - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cpu - cu_version: cpu - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.9_cpu - python_version: '3.9' - wheel_docker_image: pytorch/manylinux-cpu - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.9_cpu_upload - requires: - - nightly_binary_linux_conda_py3.9_cpu - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cuda116 - cu_version: cu116 - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.9_cu116 - python_version: '3.9' - wheel_docker_image: pytorch/manylinux-cuda116 - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.9_cu116_upload - requires: - - nightly_binary_linux_conda_py3.9_cu116 - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cuda117 - cu_version: cu117 - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.9_cu117 - python_version: '3.9' - wheel_docker_image: pytorch/manylinux-cuda117 - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.9_cu117_upload - requires: - - nightly_binary_linux_conda_py3.9_cu117 - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cpu - cu_version: cpu - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.10_cpu - python_version: '3.10' - wheel_docker_image: pytorch/manylinux-cpu - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.10_cpu_upload - requires: - - nightly_binary_linux_conda_py3.10_cpu - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cuda116 - cu_version: cu116 - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.10_cu116 - python_version: '3.10' - wheel_docker_image: pytorch/manylinux-cuda116 - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.10_cu116_upload - requires: - - nightly_binary_linux_conda_py3.10_cu116 - - binary_linux_conda: - conda_docker_image: pytorch/conda-builder:cuda117 - cu_version: cu117 - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.10_cu117 - python_version: '3.10' - wheel_docker_image: pytorch/manylinux-cuda117 - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.10_cu117_upload - requires: - - nightly_binary_linux_conda_py3.10_cu117 - - binary_macos_conda: - conda_docker_image: pytorch/conda-builder:cpu - cu_version: cpu - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_macos_conda_py3.7_cpu - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cpu - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_macos_conda_py3.7_cpu_upload - requires: - - nightly_binary_macos_conda_py3.7_cpu - - binary_macos_conda: - conda_docker_image: pytorch/conda-builder:cpu - cu_version: cpu - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_macos_conda_py3.8_cpu - python_version: '3.8' - wheel_docker_image: pytorch/manylinux-cpu - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_macos_conda_py3.8_cpu_upload - requires: - - nightly_binary_macos_conda_py3.8_cpu - - binary_macos_conda: - conda_docker_image: pytorch/conda-builder:cpu - cu_version: cpu - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_macos_conda_py3.9_cpu - python_version: '3.9' - wheel_docker_image: pytorch/manylinux-cpu - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_macos_conda_py3.9_cpu_upload - requires: - - nightly_binary_macos_conda_py3.9_cpu - - binary_macos_conda: - conda_docker_image: pytorch/conda-builder:cpu - cu_version: cpu - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_macos_conda_py3.10_cpu - python_version: '3.10' - wheel_docker_image: pytorch/manylinux-cpu - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_macos_conda_py3.10_cpu_upload - requires: - - nightly_binary_macos_conda_py3.10_cpu - binary_win_conda: cu_version: cpu filters: diff --git a/.circleci/regenerate.py b/.circleci/regenerate.py index 88c7460b206..6826febf353 100755 --- a/.circleci/regenerate.py +++ b/.circleci/regenerate.py @@ -71,6 +71,10 @@ def build_workflows(prefix="", filter_branch=None, upload=False, indentation=6, if os_type == "macos" and btype == "wheel": continue + # Disable all non-Windows Conda workflows + if os_type != "win" and btype == "conda": + continue + w += workflow_pair( btype, os_type, python_version, cu_version, unicode, prefix, upload, filter_branch=fb ) diff --git a/.github/workflows/build-conda-linux.yml b/.github/workflows/build-conda-linux.yml index 85d6f08aaf2..d38ba9fa2aa 100644 --- a/.github/workflows/build-conda-linux.yml +++ b/.github/workflows/build-conda-linux.yml @@ -40,8 +40,6 @@ jobs: post-script: ${{ matrix.post-script }} package-name: ${{ matrix.package-name }} smoke-test-script: ${{ matrix.smoke-test-script }} - # Using "development" as trigger event so these binaries are not uploaded - # to official channels yet - trigger-event: development + trigger-event: ${{ github.event_name }} secrets: CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }} diff --git a/.github/workflows/build-conda-m1.yml b/.github/workflows/build-conda-m1.yml index dd4559f78a5..cb0b687f0b0 100644 --- a/.github/workflows/build-conda-m1.yml +++ b/.github/workflows/build-conda-m1.yml @@ -41,8 +41,6 @@ jobs: package-name: ${{ matrix.package-name }} smoke-test-script: ${{ matrix.smoke-test-script }} runner-type: macos-m1-12 - # Using "development" as trigger event so these binaries are not uploaded - # to official channels yet - trigger-event: development + trigger-event: ${{ github.event_name }} secrets: CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }} diff --git a/.github/workflows/build-conda-macos.yml b/.github/workflows/build-conda-macos.yml index 11871ac2174..4b43528a326 100644 --- a/.github/workflows/build-conda-macos.yml +++ b/.github/workflows/build-conda-macos.yml @@ -41,8 +41,6 @@ jobs: package-name: ${{ matrix.package-name }} smoke-test-script: ${{ matrix.smoke-test-script }} runner-type: macos-12 - # Using "development" as trigger event so these binaries are not uploaded - # to official channels yet - trigger-event: development + trigger-event: ${{ github.event_name }} secrets: CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }} diff --git a/.github/workflows/build-m1-binaries.yml b/.github/workflows/build-m1-binaries.yml index 94846bea4be..8118fe35b15 100644 --- a/.github/workflows/build-m1-binaries.yml +++ b/.github/workflows/build-m1-binaries.yml @@ -138,13 +138,3 @@ jobs: with: name: torchvision-py${{ matrix.py_vers }}-macos11-m1-conda path: dist/ - - name: Upload package to conda - if: ${{ github.event_name == 'push' && (github.event.ref == 'refs/heads/nightly' || startsWith(github.event.ref, 'refs/tags/')) }} - shell: arch -arch arm64 bash {0} - env: - CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }} - run: | - conda install -yq anaconda-client - set -x - export ANACONDA_PATH=$(conda info --base)/bin - $ANACONDA_PATH/anaconda -t "${CONDA_PYTORCHBOT_TOKEN}" upload dist/osx-arm64/*.tar.bz2 -u "pytorch-${CHANNEL}" --label main --no-progress --force