Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add skimage requirement for CIL-Demos #1955

Merged
merged 4 commits into from
Oct 21, 2024
Merged

Add skimage requirement for CIL-Demos #1955

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abbe527
Add tomopy requirement
lauramurgatroyd Oct 17, 2024
10f8dc1
Add scikit-image and tomopy to install instructions
lauramurgatroyd Oct 17, 2024
0c40d5c
Update CHANGELOG.md
lauramurgatroyd Oct 17, 2024
42ad411
Remove tomopy
lauramurgatroyd Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
- Fix bug with 'median' and 'mean' methods in Masker averaging over the wrong axes.
- Enhancements:
- Removed multiple exits from numba implementation of KullbackLeibler divergence (#1901)
- Dependencies:
- Added tomopy to `requirements-test.yml` as this is needed for new Pagain CIL-Demo.
- Added tomopy and scikit-image to CIL-Demos conda install command as needed for new Paganin and Callbacks notebooks.
lauramurgatroyd marked this conversation as resolved.
Show resolved Hide resolved

* 24.2.0
- New Features:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ conda create --name cil -c conda-forge -c https://software.repos.intel.com/pytho
To install CIL and the additional packages and plugins needed to run the [CIL demos](https://github.com/TomographicImaging/CIL-Demos) install the environment with:

```sh
conda create --name cil -c conda-forge -c https://software.repos.intel.com/python/conda -c ccpi cil=24.2.0 astra-toolbox=*=cuda* tigre ccpi-regulariser tomophantom ipykernel ipywidgets
conda create --name cil -c conda-forge -c https://software.repos.intel.com/python/conda -c ccpi cil=24.2.0 astra-toolbox=*=cuda* tigre ccpi-regulariser tomophantom ipykernel ipywidgets scikit-image tomopy
lauramurgatroyd marked this conversation as resolved.
Show resolved Hide resolved
```

where:
Expand Down
1 change: 1 addition & 0 deletions scripts/requirements-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,4 @@ dependencies:
- numba
- tqdm
- zenodo_get >=1.6
- tomopy
lauramurgatroyd marked this conversation as resolved.
Show resolved Hide resolved