torch20 opt

.github/workflows/ci.yml

@@ -11,17 +11,16 @@ on:
 jobs:
   Tests:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.9", "3.10"]
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - name: Setup Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.8.12
-      - uses: syphar/restore-virtualenv@v1
-        id: cnetenv
-        with:
-          requirement_files: setup.cfg
-      - uses: syphar/restore-pip-download-cache@v1
-        if: steps.cnetenv.outputs.cache-hit != 'true'
+          python-version: ${{ matrix.python-version }}
+          cache: pip # caching pip dependencies based on changes to pyproject.toml
       - name: Install GDAL binaries
         run: |
           # Temporary? dpkg fix: https://askubuntu.com/questions/1276111/error-upgrading-grub-efi-amd64-signed-special-device-old-ssd-does-not-exist
@@ -39,19 +38,19 @@ jobs:
       - name: Install Python packages
         run: |
           # Install Python GDAL
-          pip install -U pip setuptools wheel
-          pip install -U Cython "numpy<=1.21.0"
+          pip install -U pip
+          pip install -U setuptools wheel
+          pip install -U numpy==1.24.4
+          pip install setuptools==57.5.0
           GDAL_VERSION=$(gdal-config --version | awk -F'[.]' '{print $1"."$2"."$3}')
           pip install GDAL==$GDAL_VERSION --no-binary=gdal
       - name: Install PyTorch
         run: |
           TORCH_CPU="https://download.pytorch.org/whl/cpu"
-          TORCH_VERSION="1.13.0"
-          pip install --upgrade --no-cache-dir setuptools>=0.59.5
-          pip install torch==${TORCH_VERSION} torchvision torchaudio --extra-index-url $TORCH_CPU
-          PYG_TORCH_CPU="https://data.pyg.org/whl/torch-${TORCH_VERSION}+cpu.html"
-          pip install torch-scatter torch-sparse torch-cluster torch-spline-conv torch-geometric -f $PYG_TORCH_CPU
-        if: steps.cnetenv.outputs.cache-hit != 'true'
+          TORCH_VERSION="2.2.2"
+          pip install -U --no-cache-dir setuptools>=65.5.1
+          pip install torch==${TORCH_VERSION} torchvision==0.17.2 torchaudio==${TORCH_VERSION} --extra-index-url $TORCH_CPU
+          pip install natten==0.17.1+torch220cpu -f https://shi-labs.com/natten/wheels
       - name: Install cultionet
         run: |
           pip install .
@@ -60,52 +59,3 @@ jobs:
           pip install pytest
           cd tests/
           python -m pytest
-
-#   Version:
-#     needs: Tests
-#     if: github.event_name == 'push' && github.ref == 'refs/heads/main' && !contains(github.event.head_commit.message, 'chore(release):')
-#     runs-on: ubuntu-latest
-#     concurrency: release
-#     steps:
-#       - uses: actions/checkout@v2
-#         with:
-#           fetch-depth: 0
-#           token: ${{ secrets.CULTIONET_TOKEN }}
-#       - uses: actions/setup-python@v2
-#         with:
-#           python-version: 3.8.12
-#       - name: Python Semantic Release
-#         run: |
-#           python -m pip install python-semantic-release
-#           # Add credentials
-#           git config user.name "github-actions"
-#           git config user.email "github-actions@github.com"
-#           # Bump cultionet version
-#           semantic-release publish
-#         env:
-#           GH_TOKEN: ${{ secrets.CULTIONET_TOKEN }}
-
-#   # https://github.com/fnkr/github-action-ghr
-#   Release:
-#     needs: Version
-#     if: github.event_name == 'push' && github.ref == 'refs/heads/main' && !contains(github.event.head_commit.message, 'chore(release):')
-#     name: Upload release
-#     runs-on: ubuntu-latest
-#     steps:
-#       - uses: actions/checkout@v2
-#       - uses: actions/setup-python@v2
-#         with:
-#           python-version: 3.8.12
-#       - uses: syphar/restore-virtualenv@v1
-#         id: cnetenv
-#         with:
-#           requirement_files: setup.cfg
-#       - uses: syphar/restore-pip-download-cache@v1
-#         if: steps.cnetenv.outputs.cache-hit != 'true'
-#       - name: Checkout
-#         uses: fnkr/github-action-ghr@v1
-#         if: startsWith(github.ref, 'refs/tags/')
-#         env:
-#           GHR_PATH: .
-#           GHR_COMPRESS: gz
-#           GITHUB_TOKEN: ${{ secrets.CULTIONET_TOKEN }}

.pre-commit-config.yaml

@@ -3,12 +3,14 @@ repos:
     rev: 22.3.0
     hooks:
     - id: black
+      exclude: src/cultionet/utils/stats.py
       language_version: python3
       args: [--skip-string-normalization]
   - repo: https://github.com/myint/docformatter
     rev: v1.4
     hooks:
     - id: docformatter
+      exclude: src/cultionet/utils/stats.py
       args: [
         --in-place,
         --wrap-summaries,
@@ -20,3 +22,11 @@ repos:
     rev: 6.0.0
     hooks:
     - id: flake8
+      exclude: src/cultionet/utils/stats.py
+  - repo: https://github.com/pycqa/isort
+    rev: 5.11.5
+    hooks:
+      - id: isort
+        exclude: src/cultionet/utils/stats.py
+        name: isort (python)
+        args: [--settings-path=pyproject.toml]