From 45fca8f971ba37bc6ee5cf2f634d3cf9574f0061 Mon Sep 17 00:00:00 2001
From: YiyaoYang1 <yao001123321@163.com>
Date: Fri, 13 Oct 2023 15:19:57 +0800
Subject: [PATCH] torch 2.1.0 ci

---
 .circleci/test.yml                     | 18 +++++++++---------
 .github/workflows/merge_stage_test.yml | 23 ++++++++++++++++++-----
 .github/workflows/pr_stage_test.yml    | 22 ++++++++++++++++++++--
 3 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/.circleci/test.yml b/.circleci/test.yml
index 78f8da28a9..3a978e5d83 100644
--- a/.circleci/test.yml
+++ b/.circleci/test.yml
@@ -137,7 +137,7 @@ jobs:
         type: string
       cuda:
         type: enum
-        enum: ["10.1", "10.2", "11.1", "11.7"]
+        enum: ["10.1", "10.2", "11.1", "11.7", "11.8"]
       cudnn:
         type: integer
         default: 7
@@ -261,8 +261,8 @@ workflows:
             - lint
       - build_cpu:
           name: maximum_version_cpu
-          torch: 2.0.0
-          torchvision: 0.15.1
+          torch: 2.1.0
+          torchvision: 0.16.0
           python: 3.9.0
           requires:
             - minimum_version_cpu
@@ -290,8 +290,8 @@ workflows:
             - hold
       - build_cuda:
           name: maximum_version_gpu
-          torch: 2.0.0
-          cuda: "11.7"
+          torch: 2.1.0
+          cuda: "11.8"
           cudnn: 8
           requires:
             - hold
@@ -306,7 +306,7 @@ workflows:
           # Use double quotation mark to explicitly specify its type
           # as string instead of number
           cuda: "10.1"
-          filters:
-            branches:
-              only:
-                - main
+          # filters:
+          #   branches:
+          #     only:
+          #       - main
diff --git a/.github/workflows/merge_stage_test.yml b/.github/workflows/merge_stage_test.yml
index 33d2c13f4a..00f13aec12 100644
--- a/.github/workflows/merge_stage_test.yml
+++ b/.github/workflows/merge_stage_test.yml
@@ -1,7 +1,7 @@
 name: merge_stage_test
 
 on:
-  push:
+  pull_request:
     paths-ignore:
       - ".github/**.md"
       - "docker/**"
@@ -58,7 +58,7 @@ jobs:
     strategy:
       matrix:
         python-version: [3.7]
-        torch: [1.6.0, 1.7.1, 1.8.1, 1.9.1, 1.10.1, 1.11.0, 1.12.0, 1.13.0]
+        torch: [1.6.0, 1.7.1, 1.8.1, 1.9.1, 1.10.1, 1.11.0, 1.12.0, 1.13.0, 2.0.0, 2.1.0]
         include:
           - torch: 1.6.0
             torchvision: 0.7.0
@@ -79,6 +79,14 @@ jobs:
           - torch: 2.0.0
             torchvision: 0.15.1
             python-version: 3.8
+          - torch: 2.1.0
+            torchvision: 0.16.0
+            python-version: 3.8
+        exclude:
+          - torch: 2.0.0
+            python-version: 3.7
+          - torch: 2.1.0
+            python-version: 3.7
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
@@ -229,7 +237,7 @@ jobs:
     strategy:
       matrix:
         python-version: [3.7]
-        torch: [1.6.0, 1.8.1, 1.13.0]
+        torch: [1.6.0, 1.8.1, 1.13.0, 2.1.0]
         include:
           - torch: 1.6.0
             torchvision: 0.7.0
@@ -237,6 +245,8 @@ jobs:
             torchvision: 0.9.1
           - torch: 1.13.0
             torchvision: 0.14.0
+          - torch: 2.1.0
+            torchvision: 0.16.0
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python 3.7
@@ -273,13 +283,16 @@ jobs:
       matrix:
         python-version: [3.7]
         platform: [cpu, cu111]
-        torch: [1.8.1]
-        torchvision: [0.9.1]
+        torch: [1.8.1, 2.1.0]
+        torchvision: [0.9.1, 0.16.0]
         include:
           - python-version: 3.8
             platform: cu117
             torch: 2.0.0
             torchvision: 0.15.1
+          - torch: 2.1.0
+            torchvision: 0.16.0
+            python-version: 3.8
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
diff --git a/.github/workflows/pr_stage_test.yml b/.github/workflows/pr_stage_test.yml
index 9ab31ebfe0..aee0d60272 100644
--- a/.github/workflows/pr_stage_test.yml
+++ b/.github/workflows/pr_stage_test.yml
@@ -138,13 +138,16 @@ jobs:
       matrix:
         python-version: [3.7]
         platform: [cpu, cu111]
-        torch: [1.8.1]
-        torchvision: [0.9.1]
+        torch: [1.8.1, 2.1.0]
+        torchvision: [0.9.1, 0.16.0]
         include:
           - python-version: 3.8
             platform: cu117
             torch: 2.0.0
             torchvision: 0.15.1
+          - torch: 2.1.0
+            torchvision: 0.16.0
+            python-version: 3.8
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
@@ -170,3 +173,18 @@ jobs:
         # Skip testing distributed related unit tests since the memory of windows CI is limited
         run: pytest tests/ --ignore tests/test_dist --ignore tests/test_optim/test_optimizer/test_optimizer_wrapper.py --ignore tests/test_model/test_wrappers/test_model_wrapper.py --ignore tests/test_hooks/test_sync_buffers_hook.py
         if: ${{ matrix.platform == 'cu111' }}
+
+  build_macos:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        torch: [1.8.1, 2.1.0]
+        include:
+          - torch: 1.8.1
+            torchvision: 0.9.1
+            python-version: 3.7
+          - torch: 2.1.0
+            torchvision: 0.16.0
+            python-version: 3.8
+    steps:
+      - uses: actions/checkout@v2