From c7a38950bf72815e0f47a9b826b52b01e1be0062 Mon Sep 17 00:00:00 2001
From: gaotongxiao <gaotongxiao@gmail.com>
Date: Sat, 28 Oct 2023 12:01:15 +0800
Subject: [PATCH] ci

---
 .circleci/docker/Dockerfile            |  1 +
 .circleci/test.yml                     | 20 +++++++++++++-------
 .github/workflows/merge_stage_test.yml |  5 ++++-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.circleci/docker/Dockerfile b/.circleci/docker/Dockerfile
index d9cf8cc77..b5efe06a4 100644
--- a/.circleci/docker/Dockerfile
+++ b/.circleci/docker/Dockerfile
@@ -1,6 +1,7 @@
 ARG PYTORCH="1.8.1"
 ARG CUDA="10.2"
 ARG CUDNN="7"
+ARG DEBIAN_FRONTEND=noninteractive
 
 FROM pytorch/pytorch:${PYTORCH}-cuda${CUDA}-cudnn${CUDNN}-devel
 
diff --git a/.circleci/test.yml b/.circleci/test.yml
index c24bebcb5..51d9770ad 100644
--- a/.circleci/test.yml
+++ b/.circleci/test.yml
@@ -80,16 +80,22 @@ 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
     machine:
-      image: ubuntu-2004-cuda-11.4:202110-01
+      image: linux-cuda-11:default
       # docker_layer_caching: true
-    resource_class: gpu.nvidia.small
+    resource_class: gpu.nvidia.small.multi
     steps:
       - checkout
+      - run:
+          name: Install nvidia-container-toolkit and Restart Docker
+          command: |
+            sudo apt-get update
+            sudo apt-get install -y nvidia-container-toolkit
+            sudo systemctl restart docker
       - run:
           # Cloning repos in VM since Docker doesn't have access to the private key
           name: Clone Repos
@@ -152,8 +158,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
@@ -171,10 +177,10 @@ workflows:
             - hold
       - build_cuda:
           name: mainstream_version_gpu
-          torch: 2.0.0
+          torch: 2.1.0
           # Use double quotation mark to explicitly specify its type
           # as string instead of number
-          cuda: "11.7"
+          cuda: "11.8"
           cudnn: 8
           requires:
             - hold
diff --git a/.github/workflows/merge_stage_test.yml b/.github/workflows/merge_stage_test.yml
index 856ede833..44be34746 100644
--- a/.github/workflows/merge_stage_test.yml
+++ b/.github/workflows/merge_stage_test.yml
@@ -60,7 +60,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.1, 1.13.0]
+        torch: [1.6.0, 1.7.1, 1.8.1, 1.9.1, 1.10.1, 1.11.0, 1.12.1, 1.13.0, 2.0.0, 2.1.0]
         include:
           - torch: 1.6.0
             torchvision: 0.7.0
@@ -81,6 +81,9 @@ 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
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}