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

Ipp version #1971

Merged
merged 3 commits into from
Oct 29, 2024
Merged

Ipp version #1971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e3aa7b
add ipp version pinning
gfardell Oct 28, 2024
640d2cf
Update ipp version in install instructions
gfardell Oct 28, 2024
bd73afb
update pinning
gfardell Oct 28, 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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ We recommend using either [`miniconda`](https://docs.conda.io/projects/miniconda
Install a new environment using:

```sh
conda create --name cil -c conda-forge -c https://software.repos.intel.com/python/conda -c ccpi cil=24.2.0
conda create --name cil -c conda-forge -c https://software.repos.intel.com/python/conda -c ccpi cil=24.2.0 ipp=2021.12
```

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 scikit-image
conda create --name cil -c conda-forge -c https://software.repos.intel.com/python/conda -c ccpi cil=24.2.0 ipp=2021.12 astra-toolbox=*=cuda* tigre ccpi-regulariser tomophantom ipykernel ipywidgets scikit-image
```

where:
Expand Down
3 changes: 3 additions & 0 deletions recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
# Tomas Kulhanek (STFC)

#creates pairs of versions using zip_keys, lists must be the same length
ipp_version:
- '2021.12'
python:
- 3.10
- 3.10
Expand All @@ -41,3 +43,4 @@ numpy:
zip_keys:
- python
- numpy

8 changes: 4 additions & 4 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ requirements:
- openmp # [osx]
- vc 14 # [win]
- cil-data
- ipp-include >=2021.10
- ipp-devel >=2021.10
- ipp >=2021.10
- ipp-include {{ ipp_version }}
- ipp-devel {{ ipp_version }}
- ipp {{ ipp_version }}

run:
- python
Expand All @@ -67,7 +67,7 @@ requirements:
- olefile >=0.46
- pywavelets
- cil-data >=21.3.0
- ipp >=2021.10
- {{ pin_compatible('ipp', min_pin='x.x', max_pin='x.x') }}
- tqdm
- numba
- zenodo_get >=1.6
Expand Down
6 changes: 3 additions & 3 deletions scripts/requirements-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ dependencies:
- packaging
- cmake >=3.16
- setuptools <71
- ipp-include >=2021.10
- ipp-devel >=2021.10
- ipp >=2021.10
- ipp-include=2021.12
- ipp-devel=2021.12
- ipp=2021.12
- ipywidgets
- scipy
- matplotlib
Expand Down
Loading