Skip to content

Commit b0e1888

Browse files
authored
Merge pull request #203 from TomographicImaging/ci-matrix
CI: test windows & more versions
2 parents 9dee4c0 + dc44ae0 commit b0e1888

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/build.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,16 @@ jobs:
4949
conda env remove -n "${{ steps.reqs.outputs.envname }}"
5050
test:
5151
defaults: {run: {shell: 'bash -el {0}'}}
52-
runs-on: ubuntu-latest
52+
runs-on: ${{ matrix.os }}
5353
strategy:
5454
matrix:
55+
python-version: ['3.10', 3.11]
56+
numpy-version: [1.23, 1.26]
57+
os: [ubuntu-latest, windows-latest]
5558
include:
56-
- python-version: '3.10' # min supported
57-
numpy-version: 1.23
58-
- python-version: 3.12 # max supported
59+
- python-version: 3.12 # needs numpy>=1.26
5960
numpy-version: 1.26
61+
os: ubuntu-latest
6062
steps:
6163
- uses: actions/checkout@v4
6264
with: {fetch-depth: 0, submodules: recursive}

Readme.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
Iterative image reconstruction (IIR) methods frequently require regularisation to ensure convergence and make inverse problem well-posed. The CCPi-Regularisation Toolkit (CCPi-RGL) toolkit provides a set of 2D/3D regularisation strategies to guarantee a better performance of IIR methods (higher SNR and resolution). The regularisation modules for scalar and vectorial datasets are based on the [proximal operator](https://en.wikipedia.org/wiki/Proximal_operator) framework and can be used with [proximal splitting algorithms](https://en.wikipedia.org/wiki/Proximal_gradient_method), such as PDHG, Douglas-Rachford, ADMM, FISTA and [others](https://arxiv.org/abs/0912.3522). While the main target for CCPi-RGL is [tomographic image reconstruction](https://github.com/dkazanc/ToMoBAR), the toolkit can be used for image denoising problems. The core modules are written in C-OMP and CUDA languages and wrappers for Matlab and Python are provided. With [CuPy](https://docs.cupy.dev/en/stable/index.html) dependency installed for Python, one can use regularisers directly without the need for explicit compilation. We recommend this option as the simplest to start with if you've got a GPU. This software can also be used by running in parallel across multiple GPU devices on a PC or a cluster compute node.
88

9-
<div align="center">
10-
<img src="demos/images/CCPiRGL_sm.jpg" height="400"><br>
11-
</div>
9+
<div align="center"><img src="demos/images/CCPiRGL_sm.jpg" height="400"></div>
1210

1311
## Prerequisites
1412

0 commit comments

Comments
 (0)