Skip to content

Commit caeee8d

Browse files
committed
rename master -> main
- also drop CI on release (since on tag is sufficient)
1 parent 06ad5d1 commit caeee8d

2 files changed

Lines changed: 5 additions & 9 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
name: ci
22
on:
3-
release: {types: [published]}
4-
push:
5-
branches: [master]
6-
tags: ['**']
7-
pull_request:
8-
branches: [master]
3+
push: {branches: [main], tags: ['v**']}
4+
pull_request: {branches: [main]}
95
jobs:
106
test-cuda:
117
runs-on: [self-hosted, python, cuda]
@@ -54,7 +50,7 @@ jobs:
5450
build-args: --experimental --variant cuda_version_major=${{ matrix.cuda-version }} ${{ matrix.cuda-version == 'None' && ' ' || '--no-test' }}
5551
artifact-name: conda-${{ matrix.os }}-${{ matrix.cuda-version }}
5652
conda-upload:
57-
if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags')
53+
if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags')
5854
defaults: {run: {working-directory: output}}
5955
runs-on: ubuntu-slim
6056
needs: conda-build

‎Readme.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![CI status](https://github.com/TomographicImaging/CCPi-Regularisation-Toolkit/actions/workflows/build.yml/badge.svg)](https://github.com/TomographicImaging/CCPi-Regularisation-Toolkit/actions/workflows/build.yml)
44
[![conda version](https://anaconda.org/ccpi/ccpi-regulariser/badges/version.svg) ![conda date](https://anaconda.org/ccpi/ccpi-regulariser/badges/latest_release_date.svg) ![conda platforms](https://anaconda.org/ccpi/ccpi-regulariser/badges/platforms.svg) ![conda downloads](https://anaconda.org/ccpi/ccpi-regulariser/badges/downloads.svg)](https://anaconda.org/ccpi/ccpi-regulariser)
5-
[![License](https://img.shields.io/github/license/TomographicImaging/CCPi-Regularisation-Toolkit)](https://github.com/TomographicImaging/CCPi-Regularisation-Toolkit/blob/master/LICENSE)
5+
[![License](https://img.shields.io/github/license/TomographicImaging/CCPi-Regularisation-Toolkit)](https://github.com/TomographicImaging/CCPi-Regularisation-Toolkit/blob/main/LICENSE)
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

@@ -83,7 +83,7 @@ Once installed please see [Demos](./demos/demo_gpu_regularisers3D_CuPy.py). Plea
8383

8484
### License
8585

86-
[![License](https://img.shields.io/github/license/TomographicImaging/CCPi-Regularisation-Toolkit)](https://github.com/TomographicImaging/CCPi-Regularisation-Toolkit/blob/master/LICENSE)
86+
[![License](https://img.shields.io/github/license/TomographicImaging/CCPi-Regularisation-Toolkit)](https://github.com/TomographicImaging/CCPi-Regularisation-Toolkit/blob/main/LICENSE)
8787

8888
### Acknowledgments
8989

0 commit comments

Comments
 (0)