Merge pull request #17 from opendilab/dev/torch

dev(hansbug): try use treevalue 1.4.11
opendilab · May 29, 2023 · c5125cc · c5125cc
2 parents 5371923 + f637608
commit c5125cc
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 20 deletions.
diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml
@@ -6,8 +6,6 @@ name: Docs Deploy
 on:
   push:
     branches: [ main, 'doc/*', 'dev/*', 'test/*' ]
-  pull_request:
-    branches: [ main, 'doc/*', 'dev/*', 'test/*' ]
   release:
     types: [ published ]
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - 'ubuntu-20.04'
+          - 'ubuntu-latest'
         python-version:
           - '3.8'
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,8 +3,6 @@ name: Code Test
 on:
   push:
     branches: [ main, 'dev/*', 'test/*', 'fix/*' ]
-  pull_request:
-    branches: [ main, 'dev/*', 'test/*', 'fix/*' ]
 
 jobs:
   unittest:
@@ -14,27 +12,36 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - 'ubuntu-20.04'
-          - 'windows-2019'  # need to be fixed, see: https://github.com/opendilab/treevalue/issues/41
-          - 'macos-11'
+          - 'ubuntu-latest'
+          - 'windows-latest'  # need to be fixed, see: https://github.com/opendilab/treevalue/issues/41
+          - 'macos-latest'
         python-version:
           - '3.7'
           - '3.8'
           - '3.9'
           - '3.10'
+          - '3.11'
         numpy-version:
           - '1.18.0'
           - '1.22.0'
+          - '1.24.0'
         torch-version:
           - '1.2.0'
           - '1.6.0'
           - '1.10.0'
-          - '1.12.0'
+          - '1.13.0'
+          - '2.0.1'
         exclude:
           - python-version: '3.7'
             numpy-version: '1.22.0'
+          - python-version: '3.7'
+            numpy-version: '1.24.0'
           - python-version: '3.10'
             numpy-version: '1.18.0'
+          - python-version: '3.11'
+            numpy-version: '1.18.0'
+          - python-version: '3.7'
+            torch-version: '2.0.1'
           - python-version: '3.8'
             torch-version: '1.2.0'
           - python-version: '3.9'
@@ -47,16 +54,40 @@ jobs:
             torch-version: '1.6.0'
           - python-version: '3.10'
             torch-version: '1.10.0'
-          - os: 'windows-2019'
+          - python-version: '3.11'
             torch-version: '1.2.0'
-          - os: 'windows-2019'
+          - python-version: '3.11'
             torch-version: '1.6.0'
-          - os: 'windows-2019'
+          - python-version: '3.11'
+            torch-version: '1.10.0'
+          - os: 'windows-latest'
+            torch-version: '1.2.0'
+          - os: 'windows-latest'
+            torch-version: '1.6.0'
+          - os: 'windows-latest'
+            python-version: '3.11'
+            torch-version: '1.13.0'
+          - os: 'macos-latest'
+            python-version: '3.11'
+            torch-version: '1.13.0'
+          - os: 'ubuntu-latest'
+            python-version: '3.11'
+            numpy-version: '1.22.0'
+          - os: 'windows-latest'
             python-version: '3.9'
             numpy-version: '1.18.0'
-          - os: 'windows-2019'
+          - os: 'windows-latest'
             python-version: '3.10'
             numpy-version: '1.18.0'
+          - os: 'windows-latest'
+            python-version: '3.11'
+            numpy-version: '1.18.0'
+          - os: 'macos-latest'
+            python-version: '3.11'
+            numpy-version: '1.18.0'
+          - os: 'macos-latest'
+            python-version: '3.11'
+            numpy-version: '1.22.0'
 
     steps:
       - name: Get system version for Linux
@@ -112,6 +143,11 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install --upgrade flake8 setuptools wheel twine
+      - name: Install dependencies
+        shell: bash
+        run: |
+          pip install -r requirements.txt
+          pip install -r requirements-test.txt
       - name: Install numpy v${{ matrix.numpy-version }}
         if: ${{ matrix.numpy-version != 'latest' }}
         shell: bash
@@ -122,11 +158,6 @@ jobs:
         shell: bash
         run: |
           pip install 'torch==${{ matrix.torch-version }}'
-      - name: Install dependencies
-        shell: bash
-        run: |
-          pip install -r requirements.txt
-          pip install -r requirements-test.txt
       - name: Test the basic environment
         shell: bash
         run: |

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-treevalue>=1.4.1
-torch>=1.1.0,<=1.12.1
+treevalue>=1.4.11
+torch>=1.1.0
 hbutils>=0.6.13
 numpy