Revert "[release] Set up CI for release/0.2 (#830)"

zou3519 · zou3519 · commit 9fa026526ac9 · 2022-05-26T14:12:44.000-07:00
This reverts commit 30e9c20.
diff --git a/.circleci/unittest/linux/scripts/install.sh b/.circleci/unittest/linux/scripts/install.sh
@@ -52,13 +52,12 @@ gcc --version
 # expecttest isn't on conda so it can't be a part of environment.yml :/
 pip install expecttest
 
-# TODO: also install torchvision when they have RC binaries.
 if [ "${CU_VERSION:-}" == cpu ] ; then
     # conda install -y pytorch torchvision cpuonly -c pytorch-nightly
     # use pip to install pytorch as conda can frequently pick older release
-    pip install torch~=1.12 -f https://download.pytorch.org/whl/test/cpu/torch_test.html --pre
+    pip install torch torchvision -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html --pre
     PYTORCH_VERSION="$(python -c "import torch; print(torch.__version__)")" python setup.py develop bdist_wheel -d $WHEELS_FOLDER
 else
-    pip install torch~=1.12 -f https://download.pytorch.org/whl/test/cpu/torch_test.html --pre
+    conda install -y pytorch torchvision cudatoolkit=10.2 -c pytorch-nightly
     PYTORCH_VERSION="$(python -c "import torch; print(torch.__version__)")" python setup.py develop bdist_wheel -d $WHEELS_FOLDER
 fi
diff --git a/.circleci/unittest/windows/scripts/install.sh b/.circleci/unittest/windows/scripts/install.sh
@@ -28,7 +28,7 @@ else
 fi
 
 printf "Installing PyTorch with %s\n" "${cudatoolkit}"
-conda install -y -c "pytorch-test" -c nvidia "pytorch-test"::pytorch[build="*${version}*"] "${cudatoolkit}"
+conda install -y -c "pytorch-${UPLOAD_CHANNEL}" -c nvidia "pytorch-${UPLOAD_CHANNEL}"::pytorch[build="*${version}*"] "${cudatoolkit}"
 
 torch_cuda=$(python -c "import torch; print(torch.cuda.is_available())")
 echo torch.cuda.is_available is $torch_cuda
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Install PyTorch Nightly
         run: |
-          python3 -mpip install --pre torch~=1.12 -f https://download.pytorch.org/whl/test/cpu/torch_test.html
+          python3 -mpip install --pre torch>=1.12.0.dev -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
       - name: Install functorch
         run: |
           python3 setup.py install
@@ -38,45 +38,45 @@ jobs:
           name: built-docs
           path: docs/build/html
 
-#  deploy-docs:
-#    needs: [build-docs]
-#    runs-on: ubuntu-latest
-#    if: (github.ref == 'refs/heads/main' && github.event_name == 'push')
-#    steps:
-#      - uses: actions/checkout@v2
-#        with:
-#          ref: gh-pages
-#          fetch-depth: 3
-#
-#      - name: Download docs artifact
-#        uses: actions/download-artifact@v2
-#        with:
-#          name: built-docs
-#          path: /tmp/docs
-#
-#      - name: Copy built docs to nightly
-#        id: copy-docs
-#        run: |
-#          cp -R /tmp/docs/* nightly/
-#          git log -3
-#          # Set commit name and hash as variables: commit_name, commit_hash
-#          echo "::set-output name=commit_name::$(git log -1 --format='%s')"
-#          echo "::set-output name=commit_hash::$(git log -1 --format='%h')"
-#
-#      - name: Git reset to commit/amend
-#        if: ${{ steps.copy-docs.outputs.commit_name == 'auto-generated commit' }}
-#        run: |
-#          # if commit_name is "auto-generated commit"
-#          # then go back in commit history to commit to the same commit
-#          git reset --soft ${{ steps.copy-docs.outputs.commit_hash }}~1
-#          git log -3
-#
-#      - name: Commit and push to gh-pages
-#        uses: github-actions-x/commit@v2.9
-#        with:
-#          github-token: ${{ secrets.GITHUB_TOKEN }}
-#          push-branch: 'gh-pages'
-#          commit-message: 'auto-generated commit'
-#          force-push: 'true'
-#          name: gha
-#          email: gha@email.org
+  deploy-docs:
+    needs: [build-docs]
+    runs-on: ubuntu-latest
+    if: (github.ref == 'refs/heads/main' && github.event_name == 'push')
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: gh-pages
+          fetch-depth: 3
+
+      - name: Download docs artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: built-docs
+          path: /tmp/docs
+
+      - name: Copy built docs to nightly
+        id: copy-docs
+        run: |
+          cp -R /tmp/docs/* nightly/
+          git log -3
+          # Set commit name and hash as variables: commit_name, commit_hash
+          echo "::set-output name=commit_name::$(git log -1 --format='%s')"
+          echo "::set-output name=commit_hash::$(git log -1 --format='%h')"
+
+      - name: Git reset to commit/amend
+        if: ${{ steps.copy-docs.outputs.commit_name == 'auto-generated commit' }}
+        run: |
+          # if commit_name is "auto-generated commit"
+          # then go back in commit history to commit to the same commit
+          git reset --soft ${{ steps.copy-docs.outputs.commit_hash }}~1
+          git log -3
+
+      - name: Commit and push to gh-pages
+        uses: github-actions-x/commit@v2.9
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          push-branch: 'gh-pages'
+          commit-message: 'auto-generated commit'
+          force-push: 'true'
+          name: gha
+          email: gha@email.org
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -4,7 +4,7 @@ on:
     types: [opened, synchronize, reopened]
   push:
     branches:
-      - release/0.2
+      - main
 
 jobs:
 
@@ -13,43 +13,31 @@ jobs:
     container: pytorch/manylinux-cpu
     strategy:
       matrix:
-        python_version: [["3.7", "cp37-cp37m"], ["3.8", "cp38-cp38"], ["3.9", "cp39-cp39"], ["3.10", "cp310-cp310"]]
+        python_abi: [ "cp37-cp37m", "cp38-cp38", "cp39-cp39" ]
     steps:
       - name: Checkout functorch
         uses: actions/checkout@v2
-      - name: Install PyTorch 1.12 RC
+      - name: Install PyTorch Nightly
         run: |
-          export PATH="/opt/python/${{ matrix.python_version[1] }}/bin:$PATH"
-          python3 -mpip install --pre torch~=1.12 -f https://download.pytorch.org/whl/test/cpu/torch_test.html
+          export PATH="/opt/python/${{ matrix.python_abi }}/bin:$PATH"
+          python3 -mpip install --pre torch>=1.12.0.dev -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
       - name: Build wheel
         run: |
-          export PATH="/opt/python/${{ matrix.python_version[1] }}/bin:$PATH"
+          export PATH="/opt/python/${{ matrix.python_abi }}/bin:$PATH"
           python3 -mpip install wheel
           python3 setup.py bdist_wheel
-          # NB: wheels have the linux_x86_64 tag so we rename to manylinux1
-          find . -name 'dist/*whl' -exec bash -c ' mv $0 ${0/linux/manylinux1}' {} \;
-      # pytorch/pytorch binaries are also manylinux_2_17 compliant but they
-      # pretend that they're manylinux1 compliant so we do the same.
-      - name: Show auditwheel output; confirm 2-17
-        run: |
-          python3 -mpip install auditwheel
-          auditwheel show dist/*
-      - name: Upload wheel for the test-wheel job
-        uses: actions/upload-artifact@v2
-        with:
-          name: functorch-linux-${{ matrix.python_version[0] }}.whl
-          path: dist/*.whl
-      - name: Upload wheel for download
+          # NB: wheels have the linux_x86_64 prefix, need to be manually renamed
+      - name: Upload wheel as GHA artifact
         uses: actions/upload-artifact@v2
         with:
-          name: functorch-batch.whl
+          name: functorch-linux.whl
           path: dist/*.whl
 
   build-wheel-mac:
     runs-on: macos-latest
     strategy:
       matrix:
-        python_version: [ "3.7", "3.8", "3.9", "3.10" ]
+        python_version: [ "3.7", "3.8", "3.9" ]
     steps:
       - name: Setup Python
         uses: actions/setup-python@v2
@@ -58,69 +46,16 @@ jobs:
           architecture: x64
       - name: Checkout functorch
         uses: actions/checkout@v2
-      - name: Install PyTorch 1.12 RC
+      - name: Install PyTorch Nightly
         run: |
-          python3 -mpip install --pre torch~=1.12 -f https://download.pytorch.org/whl/test/cpu/torch_test.html
+          python3 -mpip install --pre torch>=1.12.0.dev -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
       - name: Build wheel
         run: |
           export CC=clang CXX=clang++
           python3 -mpip install wheel
           python3 setup.py bdist_wheel
-      - name: Upload wheel for the test-wheel job
-        uses: actions/upload-artifact@v2
-        with:
-          name: functorch-mac-${{ matrix.python_version }}.whl
-          path: dist/*.whl
-      - name: Upload wheel for download
+      - name: Upload wheel as GHA artifact
         uses: actions/upload-artifact@v2
         with:
-          name: functorch-batch.whl
+          name: functorch-mac.whl
           path: dist/*.whl
-
-  test-wheel:
-    needs: [build-wheel-linux, build-wheel-mac]
-    strategy:
-      matrix:
-        os: [["linux", "ubuntu-18.04"], ["mac", "macos-latest"]]
-        python_version: [ "3.7", "3.8", "3.9", "3.10" ]
-    runs-on: ${{ matrix.os[1] }}
-    steps:
-      - name: Setup Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python_version }}
-          architecture: x64
-      - name: Checkout functorch
-        uses: actions/checkout@v2
-      - name: Install PyTorch 1.12 RC
-        run: |
-          python3 -mpip install --pre torch~=1.12 -f https://download.pytorch.org/whl/test/cpu/torch_test.html
-      - name: Upgrade pip
-        run: |
-          python3 -mpip install --upgrade pip
-      - name: Install test dependencies
-        run: |
-          python3 -mpip install numpy pytest pytest-cov codecov unittest-xml-reporting pillow>=4.1.1 scipy av networkx expecttest pyyaml
-      - name: Download built wheels
-        uses: actions/download-artifact@v2
-        with:
-          name: functorch-${{ matrix.os[0] }}-${{ matrix.python_version }}.whl
-          path: /tmp/wheels
-      - name: Install built wheels
-        run: |
-          python3 -mpip install /tmp/wheels/*
-      - name: Log version string
-        run: |
-          # Avoid ambiguity of "import functorch" by deleting the source files.
-          rm -rf functorch/
-          python -c "import functorch; print(functorch.__version__)"
-      - name: Run tests
-        run: |
-          set -e
-          export IN_CI=1
-          mkdir test-reports
-          python -m torch.utils.collect_env
-          python -c "import functorch; print(functorch.__version__)"
-          EXIT_STATUS=0
-          find test \( -name test\*.py ! -name test_functorch_lagging_op_db.py \) | xargs -I {} -n 1 python {} -v || EXIT_STATUS=$?
-          exit $EXIT_STATUS
diff --git a/packaging/pkg_helpers.bash b/packaging/pkg_helpers.bash
@@ -232,7 +232,7 @@ setup_pip_pytorch_version() {
   if [[ -z "$PYTORCH_VERSION" ]]; then
     # Install latest prerelease version of torch, per our nightlies, consistent
     # with the requested cuda version
-    pip_install --pre torch -f "https://download.pytorch.org/whl/test/${WHEEL_DIR}torch_test.html"
+    pip_install --pre torch -f "https://download.pytorch.org/whl/nightly/${WHEEL_DIR}torch_nightly.html"
     if [[ "$CUDA_VERSION" == "cpu" ]]; then
       # CUDA and CPU are ABI compatible on the CPU-only parts, so strip
       # in this case
diff --git a/setup.py b/setup.py
@@ -43,7 +43,9 @@ def write_version_file():
 # if os.getenv('PYTORCH_VERSION'):
 #     pytorch_dep += "==" + os.getenv('PYTORCH_VERSION')
 requirements = [
-    "torch>=1.12,<1.13",
+    # This represents a nightly version of PyTorch.
+    # It can be installed as a binary or from source.
+    "torch>=1.10.0.dev",
 ]
 
 extras = {}
