Update GitHub Actions for recent TensorFlow and PyTorch versions #115
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -15,22 +15,21 @@ jobs: | |||||||||||||
| max-parallel: 4 | ||||||||||||||
| matrix: | ||||||||||||||
| include: | ||||||||||||||
| - python-version: "3.9" | ||||||||||||||
| tf-version: 2.11 | ||||||||||||||
| - python-version: "3.10" | ||||||||||||||
| tf-version: 2.13 | ||||||||||||||
| - python-version: "3.11" | ||||||||||||||
| tf-version: 2.15 | ||||||||||||||
|
|
||||||||||||||
| steps: | ||||||||||||||
| - uses: actions/checkout@v3 | ||||||||||||||
|
There was a problem hiding this comment. The Python setup step was removed but shell configuration
Suggested change
|
||||||||||||||
| - name: Install dependencies | ||||||||||||||
| shell: bash -el {0} | ||||||||||||||
| run: | | ||||||||||||||
| python -m pip install --upgrade pip | ||||||||||||||
| python -m pip install --upgrade uv tox tox-uv | ||||||||||||||
| - name: Test with tox (Python ${{ matrix.python-version }} - TensorFlow ${{ matrix.tf-version }}) | ||||||||||||||
| shell: bash -el {0} | ||||||||||||||
| run: | | ||||||||||||||
| python -m tox -e py$(echo ${{ matrix.python-version }}-tf${{ matrix.tf-version }} | tr -d .) | ||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -15,22 +15,21 @@ jobs: | |||||||||||||
| max-parallel: 4 | ||||||||||||||
| matrix: | ||||||||||||||
| include: | ||||||||||||||
| - python-version: "3.9" | ||||||||||||||
| torch-version: 2.0.0 | ||||||||||||||
| - python-version: "3.10" | ||||||||||||||
| torch-version: 2.4 | ||||||||||||||
| - python-version: "3.11" | ||||||||||||||
| torch-version: 2.6 | ||||||||||||||
|
|
||||||||||||||
| steps: | ||||||||||||||
| - uses: actions/checkout@v3 | ||||||||||||||
|
There was a problem hiding this comment. The Python setup step was removed but shell configuration
Suggested change
|
||||||||||||||
| - name: Install dependencies | ||||||||||||||
| shell: bash -el {0} | ||||||||||||||
| run: | | ||||||||||||||
| python -m pip install --upgrade pip | ||||||||||||||
| python -m pip install --upgrade uv tox tox-uv | ||||||||||||||
| - name: Test with tox (Python ${{ matrix.python-version }} - Pytorch ${{ matrix.torch-version }}) | ||||||||||||||
| shell: bash -el {0} | ||||||||||||||
| run: | | ||||||||||||||
| python -m tox -e py$(echo ${{ matrix.python-version }}-torch${{ matrix.torch-version }} | tr -d .) | ||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |||||
| max-line-length = 88 | ||||||
| extend-ignore = | ||||||
| # See https://github.com/PyCQA/pycodestyle/issues/373 | ||||||
| E203 | ||||||
|
There was a problem hiding this comment. The trailing comma was removed from the extend-ignore configuration. This change makes it harder to add new ignore codes in the future and goes against common formatting practices for configuration lists.
Suggested change
|
||||||
| per-file-ignores = | ||||||
| */__init__.py: F401 | ||||||
|
|
||||||
|
|
@@ -37,91 +37,94 @@ exclude_also = | |||||
| except ImportError | ||||||
|
|
||||||
| [tox:tox] | ||||||
| envlist = py{39,310,311}-tf{211,213,214,215},py{39,310,311}-torch{113,200,22,24,26},py{39,310,311}-lint,py{39}-tf{215}-torch{202}-coverage | ||||||
|
|
||||||
| [testenv:py{39,310,311}-tf{211,213,214,215}] | ||||||
| deps = | ||||||
| packaging | ||||||
| scikit_learn | ||||||
| scipy | ||||||
| setuptools | ||||||
| pytest | ||||||
| kneed | ||||||
| tqdm | ||||||
| pandas | ||||||
| seaborn | ||||||
| requests | ||||||
| plotly == 5.15.0 | ||||||
| tf211: protobuf>=3.9.2,<3.20 | ||||||
| tf213: protobuf>=3.20.3,<4.21.0 | ||||||
| tf214: protobuf>=3.20.3,<4.21.0 | ||||||
| tf215: protobuf>=3.20.3,<4.21.0 | ||||||
| tf211: numpy~=1.23.5 | ||||||
| tf213: numpy~=1.24.3 | ||||||
| tf214: numpy~=1.24.3 | ||||||
| tf215: numpy~=1.26.0 | ||||||
| tf211: tensorflow ~= 2.11.0 | ||||||
| tf211: tensorflow_datasets | ||||||
| tf211: tensorflow_probability ~= 0.19.0 | ||||||
| tf213: tensorflow ~= 2.13.0 | ||||||
| tf213: tensorflow_datasets | ||||||
| tf213: tensorflow_probability ~= 0.21.0 | ||||||
| tf214: tensorflow ~= 2.14.0 | ||||||
| tf214: tensorflow_datasets | ||||||
| tf214: tensorflow_probability ~= 0.22.0 | ||||||
| tf215: tensorflow ~= 2.15.0 | ||||||
| tf215: tensorflow_datasets | ||||||
| tf215: tensorflow_probability ~= 0.23.0 | ||||||
| install_command = uv pip install {opts} {packages} | ||||||
| setenv = | ||||||
| DL_LIB = tensorflow | ||||||
| commands = | ||||||
| py39,py310,py311: uv pip install faiss-cpu==1.7.4 | ||||||
| tf211: uv pip install --force-reinstall numpy==1.24.0 | ||||||
| tf213: uv pip install --force-reinstall numpy==1.24.0 | ||||||
| tf214: uv pip install --force-reinstall numpy==1.24.0 | ||||||
| tf215: uv pip install --force-reinstall numpy==1.26.0 | ||||||
| pytest tests/tests_tensorflow | ||||||
|
|
||||||
| [testenv:py{39,310,311}-torch{113,200,22,24,26}] | ||||||
| deps = | ||||||
| packaging | ||||||
| scikit_learn | ||||||
| scipy | ||||||
| setuptools | ||||||
| pytest | ||||||
| kneed | ||||||
| tqdm | ||||||
| protobuf>=3.20.3,<4.21.0 | ||||||
| pandas | ||||||
| seaborn | ||||||
| requests | ||||||
| plotly == 5.15.0 | ||||||
| torch113: torch == 1.13.1+cpu | ||||||
| torch113: torchvision == 0.14.1+cpu | ||||||
| torch113: transformers == 4.43.0 | ||||||
| torch200: torch == 2.0.0+cpu | ||||||
| torch200: torchvision == 0.15.0+cpu | ||||||
| torch200: transformers == 4.49.0 | ||||||
| torch22: torch == 2.2.0+cpu | ||||||
| torch22: torchvision == 0.17.0+cpu | ||||||
| torch22: transformers == 4.49.0 | ||||||
| torch24: torch == 2.4.0+cpu | ||||||
| torch24: torchvision == 0.19.0+cpu | ||||||
| torch24: transformers == 4.49.0 | ||||||
| torch26: torch == 2.6.0+cpu | ||||||
| torch26: torchvision == 0.21.0+cpu | ||||||
| torch26: transformers == 4.49.0 | ||||||
| install_command = uv pip install --extra-index-url https://download.pytorch.org/whl/cpu {opts} {packages} | ||||||
| setenv = | ||||||
| DL_LIB = torch | ||||||
| commands = | ||||||
| py39,py310,py311: uv pip install faiss-cpu==1.7.4 | ||||||
| torch113: uv pip install --force-reinstall numpy==1.24.0 | ||||||
| torch200: uv pip install --force-reinstall numpy==1.26.0 | ||||||
| torch22: uv pip install --force-reinstall numpy==1.26.0 | ||||||
| torch24: uv pip install --force-reinstall numpy==1.26.0 | ||||||
| torch26: uv pip install --force-reinstall numpy==1.26.0 | ||||||
| pytest tests/tests_torch | ||||||
|
|
||||||
| [testenv:py{39,310,311}-lint] | ||||||
| deps = | ||||||
| black | ||||||
| flake8 | ||||||
|
|
@@ -133,7 +136,7 @@ commands = | |||||
| flake8 oodeel tests | ||||||
| # mypy --namespace-packages oodeel tests | ||||||
|
|
||||||
| [testenv:py{310}-tf{215}-torch{22}-coverage] | ||||||
| deps = | ||||||
| packaging | ||||||
| faiss_gpu | ||||||
|
|
@@ -143,21 +146,21 @@ deps = | |||||
| pytest | ||||||
| kneed | ||||||
| tqdm | ||||||
| protobuf>=3.20.3,<4.21.0 | ||||||
| coverage | ||||||
| pandas | ||||||
| seaborn | ||||||
| plotly == 5.15.0 | ||||||
| torch22: torch == 2.2.0+cpu | ||||||
| torch22: torchvision == 0.17.0+cpu | ||||||
| torch22: transformers == 4.49.0 | ||||||
| tf215: tensorflow ~= 2.15.0 | ||||||
| tf215: tensorflow_datasets | ||||||
| tf215: tensorflow_probability ~= 0.23.0 | ||||||
| install_command = uv pip install --extra-index-url https://download.pytorch.org/whl/cpu {opts} {packages} | ||||||
| setenv = | ||||||
| DL_LIB = both | ||||||
| commands = | ||||||
| tf215: uv pip install --force-reinstall numpy==1.26.0 | ||||||
| coverage run --source oodeel -m pytest | ||||||
| coverage xml | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,7 +31,6 @@ | |
| long_description = f.read() | ||
|
|
||
| requirements = [ | ||
| "numpy <= 1.26.4", | ||
| "scikit_learn", | ||
| "scipy", | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The Python setup step was removed but shell configuration
bash -el {0}suggests conda/mamba environment usage. Without the Python setup step, the workflow may fail if the default Python version doesn't match the matrix requirements.