diff --git a/README.md b/README.md index d6e8cd9731..6411588025 100644 --- a/README.md +++ b/README.md @@ -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: diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 28e16d0af2..82f4f59048 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -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 @@ -41,3 +43,4 @@ numpy: zip_keys: - python - numpy + diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 26b339bfad..f1b939eb5c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -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 @@ -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 diff --git a/scripts/requirements-test.yml b/scripts/requirements-test.yml index 17668b73d8..90de773a0f 100644 --- a/scripts/requirements-test.yml +++ b/scripts/requirements-test.yml @@ -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