Skip to content

Commit

Permalink
Fix GitHub workflows for Pycsou v2.
Browse files Browse the repository at this point in the history
  • Loading branch information
ebezzam committed Apr 25, 2023
1 parent 71f3635 commit c4a3f80
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
max-parallel: 12
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.9, "3.10"]
python-version: [3.8, 3.9, "3.10", "3.11"]
steps:
- uses: actions/checkout@v3
- name: Checkout submodules
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
max-parallel: 12
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.8, 3.9, "3.10", "3.11"]
python-version: [3.9, "3.10"]
steps:
- uses: actions/checkout@v3
- name: Checkout submodules
Expand Down Expand Up @@ -48,5 +48,5 @@ jobs:
run: |
pip install -U pytest
pip install -r recon_requirements.txt
pip uninstall pycsou
pip install git+https://github.com/matthieumeo/pycsou.git@v2-dev
pytest
20 changes: 6 additions & 14 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -79,24 +79,16 @@ install the library locally.
python scripts/recon/admm.py
Note (25-04-2023): Pycsou V2 is installed by ``recon_requirements.txt``. If PyTorch is installed, you will
need to be sure to have PyTorch 2.0 or higher, as Pycsou V2 is not compatible with earlier
version of PyTorch. Moreover, Pycsou requires Python within
`[3.9, 3.11) <https://github.com/matthieumeo/pycsou/blob/v2-dev/setup.cfg#L28>`__.

Setup for PyTorch 2.0:
Note (25-04-2023): for using the Pycsou models V2 has to be installed:

.. code:: bash
# default should be PyTorch 2.0
pip install torch torchvision torchaudio
# nightly build for GPU
pip install numpy --pre torch --force-reinstall --extra-index-url https://download.pytorch.org/whl/nightly/cu117
# nightly build for CPU
pip install --pre torch --extra-index-url https://download.pytorch.org/whl/nightly/cpu
pip install git+https://github.com/matthieumeo/pycsou.git@v2-dev
If PyTorch is installed, you will need to be sure to have PyTorch 2.0 or higher,
as Pycsou V2 is not compatible with earlier versions of PyTorch. Moreover,
Pycsou requires Python within
`[3.9, 3.11) <https://github.com/matthieumeo/pycsou/blob/v2-dev/setup.cfg#L28>`__.

Moreover, ``numba`` (requirement for Pycsou V2) may require an older version of NumPy:

Expand Down
3 changes: 1 addition & 2 deletions recon_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ pylops==1.18.0
scikit-image==0.19.0rc0
hydra-core
click>=8.0.1
waveprop>=0.0.3 # for simulation
git+https://github.com/matthieumeo/pycsou.git@v2-dev
waveprop>=0.0.3 # for simulation

0 comments on commit c4a3f80

Please sign in to comment.