update CI

Lightning-AI · Dec 13, 2020 · 78564b7 · 78564b7
1 parent b36cc0a
commit 78564b7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/ci_test-base.yml b/.github/workflows/ci_test-base.yml
@@ -16,7 +16,7 @@ jobs:
       # max-parallel: 6
       matrix:
         os: [ubuntu-20.04, windows-2019, macOS-10.15]
-        python-version: [3.7]
+        python-version: [3.8]
 
     # Timeout: https://stackoverflow.com/a/59076067/4521646
     timeout-minutes: 20

diff --git a/.github/workflows/ci_test-full.yml b/.github/workflows/ci_test-full.yml
@@ -53,9 +53,17 @@ jobs:
     - name: Adjust minimal for Python 3.8 and MacOS
       if: matrix.requires == 'minimal' && (runner.os == 'macOS' || matrix.python-version == 3.8)
       run : |
-        python -c "fname = 'requirements.txt' ; req = open(fname).read().replace('torch>=1.3', 'torch>=1.4') ; open(fname, 'w').write(req)"
-        python -c "fname = 'requirements/examples.txt' ; req = open(fname).read().replace('torchvision>=0.4.1', 'torchvision>=0.5.0') ; open(fname, 'w').write(req)"
-        python -c "fname = 'requirements/extra.txt' ; req = open(fname).read().replace('torchtext>=0.3.1', 'torchtext>=0.5.0') ; open(fname, 'w').write(req)"
+        python -c "import re ; fname = 'requirements.txt' ; req = re.sub(r'torch>=[\d\.]+', 'torch>=1.4.0', open(fname).read()) ; open(fname, 'w').write(req)"
+        python -c "import re ; fname = 'requirements/examples.txt' ; req = re.sub(r'torchvision>=[\d\.]+', 'torchvision>=0.5.0', open(fname).read()) ; open(fname, 'w').write(req)"
+        python -c "import re ; fname = 'requirements/extra.txt' ; req = re.sub(r'torchtext>=[\d\.]+', 'torchtext>=0.5.0', open(fname).read()) ; open(fname, 'w').write(req)"
+
+    # versions <= 1.3 may have issues on mac with some BLAS ops due to missing mkl (https://github.com/pytorch/pytorch/issues/18996)
+    - name: Adjust minimal for Python 3.9
+      if: matrix.requires == 'minimal' && matrix.python-version == 3.9
+      run : |
+        python -c "import re ; fname = 'requirements.txt' ; req = re.sub(r'torch>=[\d\.]+', 'torch>=1.7.1', open(fname).read()) ; open(fname, 'w').write(req)"
+        python -c "import re ; fname = 'requirements/examples.txt' ; req = re.sub(r'torchvision>=[\d\.]+', 'torchvision>=0.8.2', open(fname).read()) ; open(fname, 'w').write(req)"
+        python -c "import re ; fname = 'requirements/extra.txt' ; req = re.sub(r'torchtext>=[\d\.]+', 'torchtext>=0.8.1', open(fname).read()) ; open(fname, 'w').write(req)"
 
     - name: Set min. dependencies
       if: matrix.requires == 'minimal'