bump to pytorch 1.10

alibaba · Oct 23, 2024 · ec6aadc · ec6aadc
1 parent 2442ed7
commit ec6aadc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 24 deletions.
diff --git a/.github/workflows/full-test.yml b/.github/workflows/full-test.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "macos-13", "windows-latest"]
-        vers: [ {pt_ver: "1.8.0", tv_ver: "0.9.0"}, {pt_ver: "1.9.0", tv_ver: "0.10.0"}, {pt_ver: "1.10.0", tv_ver: "0.11.1"}, {pt_ver: "1.11.0", tv_ver: "0.12.0"}, {pt_ver: "1.12.0", tv_ver: "0.13.0"} ]
+        vers: [ {pt_ver: "1.10.0", tv_ver: "0.11.1"}, {pt_ver: "1.11.0", tv_ver: "0.12.0"}, {pt_ver: "1.12.0", tv_ver: "0.13.0"} ]
         include:
           - os: macos-latest
             vers:
@@ -37,7 +37,6 @@ jobs:
         with:
           auto-update-conda: true
           python-version: 3.9
-          conda-solver: classic
       - name: Install PyTorch
         env:
           PYTORCH_VER: ${{ matrix.vers.pt_ver }}
@@ -46,25 +45,20 @@ jobs:
          if [ "$RUNNER_OS" == "macOS" ]; then
             if [[ "$TORCHVISION_VER" == "latest" && "$PYTORCH_VER" == "latest" ]]; then
               conda install pytorch::pytorch torchvision -c pytorch
-            elif [[ "$TORCHVISION_VER" == "0.9."* || "$TORCHVISION_VER" == "0.10."* ]]; then
-              conda install pytorch==$PYTORCH_VER torchvision==$TORCHVISION_VER pillow=8 -c pytorch
             else
-              conda install pytorch==$PYTORCH_VER torchvision==$TORCHVISION_VER -c pytorch
+              conda install pytorch=$PYTORCH_VER torchvision=$TORCHVISION_VER -c pytorch
             fi
          elif [ "$RUNNER_OS" == "Windows" ]; then
             if [[ "$TORCHVISION_VER" == "latest" && "$PYTORCH_VER" == "latest" ]]; then
-              conda install pytorch torchvision cpuonly pillow=8 -c pytorch
-            elif [[ "$TORCHVISION_VER" == "0.9."* || "$TORCHVISION_VER" == "0.10."* ]]; then
-              conda install pillow=8 -c conda-forge
-              conda install pytorch==$PYTORCH_VER torchvision==$TORCHVISION_VER cpuonly -c pytorch
+              conda install pytorch torchvision cpuonly pillow=7 -c pytorch
             else
-              conda install pytorch==$PYTORCH_VER torchvision==$TORCHVISION_VER cpuonly pillow=8 -c pytorch
+              conda install pytorch=$PYTORCH_VER torchvision=$TORCHVISION_VER cpuonly pillow=7 -c pytorch
             fi
          else
             if [[ "$TORCHVISION_VER" == "latest" && "$PYTORCH_VER" == "latest" ]]; then
               conda install pytorch torchvision cpuonly -c pytorch
             else
-              conda install pytorch==$PYTORCH_VER torchvision==$TORCHVISION_VER cpuonly -c pytorch
+              conda install pytorch=$PYTORCH_VER torchvision=$TORCHVISION_VER cpuonly -c pytorch
             fi
          fi
       - name: Install TinyNeuralNetwork

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "macos-13", "windows-latest"]
-        vers: [ {pt_ver: "1.8.0", tv_ver: "0.9.0"}, {pt_ver: "latest", tv_ver: "latest"} ]
+        vers: [ {pt_ver: "1.10.0", tv_ver: "0.11.1"}, {pt_ver: "latest", tv_ver: "latest"} ]
         include:
           - os: macos-latest
             vers:
@@ -31,7 +31,6 @@ jobs:
         with:
           auto-update-conda: true
           python-version: 3.9
-          conda-solver: classic
       - name: Install PyTorch
         env:
           PYTORCH_VER: ${{ matrix.vers.pt_ver }}
@@ -40,25 +39,20 @@ jobs:
          if [ "$RUNNER_OS" == "macOS" ]; then
             if [[ "$TORCHVISION_VER" == "latest" && "$PYTORCH_VER" == "latest" ]]; then
               conda install pytorch::pytorch torchvision -c pytorch
-            elif [[ "$TORCHVISION_VER" == "0.9."* || "$TORCHVISION_VER" == "0.10."* ]]; then
-              conda install pytorch==$PYTORCH_VER torchvision==$TORCHVISION_VER pillow=8 -c pytorch
             else
-              conda install pytorch==$PYTORCH_VER torchvision==$TORCHVISION_VER -c pytorch
+              conda install pytorch=$PYTORCH_VER torchvision=$TORCHVISION_VER -c pytorch
             fi
          elif [ "$RUNNER_OS" == "Windows" ]; then
             if [[ "$TORCHVISION_VER" == "latest" && "$PYTORCH_VER" == "latest" ]]; then
-              conda install pytorch torchvision cpuonly pillow=8 -c pytorch
-            elif [[ "$TORCHVISION_VER" == "0.9."* || "$TORCHVISION_VER" == "0.10."* ]]; then
-              conda install pillow=8 -c conda-forge
-              conda install pytorch==$PYTORCH_VER torchvision==$TORCHVISION_VER cpuonly -c pytorch
+              conda install pytorch torchvision cpuonly pillow=7 -c pytorch
             else
-              conda install pytorch==$PYTORCH_VER torchvision==$TORCHVISION_VER cpuonly pillow=8 -c pytorch
+              conda install pytorch=$PYTORCH_VER torchvision=$TORCHVISION_VER cpuonly pillow=7 -c pytorch
             fi
          else
             if [[ "$TORCHVISION_VER" == "latest" && "$PYTORCH_VER" == "latest" ]]; then
               conda install pytorch torchvision cpuonly -c pytorch
             else
-              conda install pytorch==$PYTORCH_VER torchvision==$TORCHVISION_VER cpuonly -c pytorch
+              conda install pytorch=$PYTORCH_VER torchvision=$TORCHVISION_VER cpuonly -c pytorch
             fi
          fi
       - name: Install TinyNeuralNetwork

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ TinyNeuralNetwork is an efficient and easy-to-use deep learning model compressio
 
 ## Installation
 
-Python >= 3.9, PyTorch >= 1.8
+Python >= 3.9, PyTorch >= 1.10
 
 ```shell
 # Install the TinyNeuralNetwork framework

diff --git a/README_zh-CN.md b/README_zh-CN.md
@@ -5,7 +5,7 @@ TinyNeuralNetwork是一个高效、易用的深度学习模型压缩框架。它
 
 ## 安装
 
-python >= 3.9, pytorch >= 1.8
+python >= 3.9, pytorch >= 1.10
 
 ```shell
 # 安装TinyNeuralNetwork软件包