Merge pull request #71 from LukasHedegaard/develop

Develop

Author: LukasHedegaard

.github/workflows/codecov.yml

@@ -14,11 +14,14 @@ jobs:
     - name: Setup Python  
       uses: actions/setup-python@master
       with:
-        python-version: 3.7
+        python-version: 3.11
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install .[dev]
+    - name: Lint
+      run: |
+        flake8 . --max-complexity=12 --max-line-length=88 --select=C,E,F,W,B,B950,BLK --ignore=E203,E231,E501,W503
     - name: Generate coverage report
       run: |
         python -m pytest --cov continual --cov-report=xml -m "not skip_cicd"

.github/workflows/publish.yml

@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@master
-    - name: Set up Python 3.9
+    - name: Set up Python
       uses: actions/setup-python@v1
       with:
-        python-version: 3.9
+        python-version: 3.11
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

.github/workflows/publishtest.yml

@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@master
-    - name: Set up Python 3.9
+    - name: Set up Python
       uses: actions/setup-python@v1
       with:
-        python-version: 3.9
+        python-version: 3.11
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

.github/workflows/pythonpackage.yml

@@ -7,8 +7,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
-        python-version: [3.7, 3.9]
+        os: [ubuntu-latest]
+        python-version: [3.9, 3.12]
 
     steps:
       - uses: actions/checkout@v2
@@ -22,10 +22,6 @@ jobs:
           python -m pip install --upgrade pip
           pip install .[dev]
 
-      - name: Lint
-        run: |
-          flake8 . --max-complexity=12 --max-line-length=88 --select=C,E,F,W,B,B950,BLK --ignore=E203,E231,E501,W503
-      
       - name: Test with pytest
         run: |
           pytest -m "not skip_cicd"

CHANGELOG.md

@@ -8,6 +8,14 @@ From v1.0.0 and on, the project will adherence strictly to Semantic Versioning.
 
 ## Unpublished
 
+## [1.2.4] - 2025-03-15
+
+### Fixed
+- Multilayer transformers when num_layers>=3.
+
+### Added
+- Tests up to python 3.12.
+
 
 ## [1.2.3] - 2023-06-16
 

continual/__about__.py

@@ -1,6 +1,6 @@
 import time
 
-__version__ = "1.2.3"
+__version__ = "1.2.4"
 __author__ = "Lukas Hedegaard"
 __author_email__ = "[email protected]"
 __license__ = "Apache-2.0"

continual/conv.py

@@ -76,7 +76,7 @@ def __init__(
 
         if stride[0] > 1:
             logger.warning(
-                f"Temporal stride of {stride[0]} will result in skipped outputs every {stride[0]-1} / {stride[0]} steps"
+                f"Temporal stride of {stride[0]} will result in skipped outputs every {stride[0] - 1} / {stride[0]} steps"
             )
 
         dilation = size_fn(dilation)

continual/transformer.py

@@ -550,7 +550,7 @@ def __init__(
             layers.append(encoder_layer(MhaType.SINGLE_OUTPUT))
         else:
             layers.append(encoder_layer(MhaType.RETROACTIVE))
-            for _ in range(2, num_layers - 1):
+            for _ in range(1, num_layers - 1):
                 layers.append(
                     RetroactiveLambda(encoder_layer(MhaType.REGULAR), takes_time=True)
                 )

requirements/dev.txt

@@ -1,10 +1,10 @@
-black
-flake8
-flake8-black
+black==23.1.0
+flake8==6.0.0
+flake8-black==0.3.6
 isort>=5.7
 pytest
 pytest-cov
-ptflops>=0.6.8
+ptflops==0.6.8
 numpy
 pytorch_lightning
 onnx~=1.12

setup.py

@@ -74,5 +74,7 @@ def from_file(file_name: str = "requirements.txt", comment_char: str = "#"):
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
     ],
 )