TomographicImaging · casperdcl · Nov 24, 2023 · Nov 21, 2023 · Nov 21, 2023 · Nov 22, 2023
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,10 @@
 
 * x.x.x
   - Allow reduction methods on the DataContainer class to accept axis argument as string which matches values in dimension_labels
-  - Added the functions `set_norms` and `get_norms` to the `BlockOperator` class 
-  - Internal variable name change in BlockOperator to aid understanding 
+  - Added the functions `set_norms` and `get_norms` to the `BlockOperator` class
+  - Internal variable name change in BlockOperator to aid understanding
+  - Dropped support for IPP versions older than 2021.10 due to header changes
+  - Fix build include directories
 
 * 23.1.0
   - Fix bug in IndicatorBox proximal_conjugate
@@ -101,25 +103,25 @@
   - Raise exception if filename or data haven't been set in NexusDataWriter
   - Fixes error when update_objective_interval is set to 0 in an algorithm run
   - Deprecated:
-    - TXRMDataReader is deprecated in favour of ZEISSDataReader 
+    - TXRMDataReader is deprecated in favour of ZEISSDataReader
   - GitHub Actions:
     - Update to version 0.1.1 of lauramurgatroyd/build-sphinx-action for building the documentation - ensures docs are always built from cil master
-    
+
 * 21.4.1
  - Removed prints from unittests and cleanup of unittest code.
- - CMake: 
+ - CMake:
    - install script re-allows selection of non default install directory ([#1246](https://github.com/TomographicImaging/CIL/issues/1246))
  - TIFF writer uses logging
  - Added unittests for TIFF functionality
 
 * 21.4.0
   - PEP 440 compliant version
-  - CMake fix due to use of pip install. 
-  - Recon.FBP allows 'astra' backend 
+  - CMake fix due to use of pip install.
+  - Recon.FBP allows 'astra' backend
   - Fixed PowerMethod for square/non-square, complex/float matrices with stopping criterion.
   - CofR image_sharpness improved for large datasets
   - Geometry alignmentment fix for 2D datasets
-  - CGLS update for sapyb to enable complex data, bugfix in use of initial 
+  - CGLS update for sapyb to enable complex data, bugfix in use of initial
   - added sapyb and deprecated axpby. All algorithm updated to use sapyb.
   - Allow use of square brackets in file paths to TIFF and Nikon datasets
 
@@ -159,7 +161,7 @@
 * 21.1.0
   - Added TomoPhantom plugin to create 2D/3D + channel ImageData phantoms based on the TomoPhantom model library
   - Fixed bug in Zeiss reader geometry direction of rotation
-  
+
 * 21.0.0
   - Show2D now takes 4D datasets and slice infomation as input
   - TIGRE reconstruction package wrapped for cone-beam tomography
@@ -191,7 +193,7 @@
     - GradientDescent to GD
     - SparseFiniteDiff to SparseFiniteDifferenceOperator
     - LinearOperatorMatrix to MatrixOperator
-  - bugfix update_objective of SPDHG 
+  - bugfix update_objective of SPDHG
 
 * 20.09
   - added SPDHG algorithm

diff --git a/recipe/build.sh b/recipe/build.sh
@@ -1,39 +1,39 @@
 #  -*- coding: utf-8 -*-
 # Copyright 2019 United Kingdom Research and Innovation
 # Copyright 2019 The University of Manchester
-    
+
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-    
+
 #     http://www.apache.org/licenses/LICENSE-2.0
-    
+
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-    
+
 # Authors:
 # CIL Developers, listed at: https://github.com/TomographicImaging/CIL/blob/master/NOTICE.txt
 
 if [ `python -c "from __future__ import print_function; import platform; print (platform.system())"`  == "Darwin" ] ;
-then 
-  echo "Darwin"; 
+then
+  echo "Darwin";
   cmake ${RECIPE_DIR}/../ -DCONDA_BUILD=ON \
                         -DCMAKE_BUILD_TYPE="Release"\
                         -DLIBRARY_LIB=$CONDA_PREFIX/lib \
-                        -DLIBRARY_INC=$CONDA_PREFIX \
-                        -DCMAKE_INSTALL_PREFIX=$PREFIX\
+                        -DLIBRARY_INC=$CONDA_PREFIX/include \
+                        -DOPENMP_LIBRARIES=${CONDA_PREFIX}/lib \
                         -DOPENMP_INCLUDES=${CONDA_PREFIX}/include \
-                        -DOPENMP_LIBRARIES=${CONDA_PREFIX}/lib
-else 
-  echo "something else"; 
+                        -DCMAKE_INSTALL_PREFIX=$PREFIX
+else
+  echo "something else";
 
   cmake ${RECIPE_DIR}/../ -DCONDA_BUILD=ON \
                         -DCMAKE_BUILD_TYPE="Release"\
                         -DLIBRARY_LIB=$CONDA_PREFIX/lib \
-                        -DLIBRARY_INC=$CONDA_PREFIX \
+                        -DLIBRARY_INC=$CONDA_PREFIX/include \
                         -DCMAKE_INSTALL_PREFIX=$PREFIX
 
 fi

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,22 +1,18 @@
-#  -*- coding: utf-8 -*-
 # Copyright 2018 United Kingdom Research and Innovation
 # Copyright 2018 The University of Manchester
-
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-
 #     http://www.apache.org/licenses/LICENSE-2.0
-
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 # Authors:
 # CIL Developers, listed at: https://github.com/TomographicImaging/CIL/blob/master/NOTICE.txt
 # Kyle Pidgeon (UKRI-STFC)
+
 package:
   name: cil
   # use the latest stable release version
@@ -37,23 +33,23 @@ build:
 test:
   requires:
     - python-wget
-    - cvxpy # [ linux ]    
+    - cvxpy # [ linux ]
     - scikit-image
     - tomophantom=2.0.0 # [ linux ]
-    - tigre=2.4 # [ not osx ] 
+    - tigre=2.4 # [ not osx ]
     - packaging
     - ccpi-regulariser=22.0.0 # [ not osx ]
     - astra-toolbox>=1.9.9.dev5,<2.1
 
   source_files:
     - ./Wrappers/Python/test # [win]
-    - ./Wrappers/Python/test # [not win] 
+    - ./Wrappers/Python/test # [not win]
 
   commands:
     - python -c "import os; print ('TESTING IN THIS DIRECTORY' , os.getcwd())"
     - python -m unittest discover -v -s Wrappers/Python/test  # [win]
     - python -m unittest discover -s Wrappers/Python/test -v  # [not win]
-    
+
 requirements:
   build:
     - python
@@ -69,9 +65,9 @@ requirements:
     - vc 14         # [win]
     - cil-data
     - ripgrep
-    - ipp-include
-    - ipp-devel
-    - ipp
+    - ipp-include >=2021.10
+    - ipp-devel >=2021.10
+    - ipp >=2021.10
 
   run:
     - python
@@ -89,7 +85,7 @@ requirements:
     - olefile >=0.46
     - pywavelets
     - cil-data >=21.3.0
-    - ipp
+    - ipp >=2021.10
     - tqdm
     - numba
 

diff --git a/scripts/requirements-test.yml b/scripts/requirements-test.yml
@@ -1,21 +1,17 @@
-#  -*- coding: utf-8 -*-
 # Copyright 2023 United Kingdom Research and Innovation
 # Copyright 2023 The University of Manchester
-
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-
 #     http://www.apache.org/licenses/LICENSE-2.0
-
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 # Authors:
 # CIL Developers, listed at: https://github.com/TomographicImaging/CIL/blob/master/NOTICE.txt
+
 name: cil_dev
 channels:
   - conda-forge
@@ -35,18 +31,18 @@ dependencies:
   - scikit-image
   - packaging
   - cmake >=3.16
-  - setuptools 
-  - ipp-include 
-  - ipp-devel 
-  - ipp
-  - ipywidgets 
-  - scipy 
+  - setuptools
+  - ipp-include >=2021.10
+  - ipp-devel >=2021.10
+  - ipp >=2021.10
+  - ipywidgets
+  - scipy
   - matplotlib
-  - h5py 
+  - h5py
   - pillow
   - libgcc-ng
   - dxchange
   - olefile
   - pywavelets
   - numba
-  - tqdm
+  - tqdm
diff --git a/src/Core/Binning.cpp b/src/Core/Binning.cpp
@@ -22,8 +22,7 @@
 #include <stdio.h>
 #include <cstring>
 #include <cstddef>
-#include <ipp.h>
-#include <ipps.h>
+#include "ipp.h"
 #include <omp.h>
 #include "utilities.h"
 
@@ -197,4 +196,4 @@ extern "C"
 	void Binner_delete(void* binner) { delete (Binner*)binner; }
 	void* Binner_new(const size_t* shape_in, const size_t* shape_out, const size_t* pixel_index_start, const size_t* binning_list) { return new Binner(shape_in, shape_out, pixel_index_start, binning_list); }
 	int Binner_bin(void* binner, const float* data_in, float* data_binned) { return ((Binner*)binner)->bin(data_in, data_binned); }
-}
+}
diff --git a/src/Core/include/FBP_filtering.h b/src/Core/include/FBP_filtering.h
@@ -19,8 +19,7 @@
 
 #include <iostream>
 #include <stdio.h>
-#include <ipp.h>
-#include <ipps.h>
+#include "ipp.h"
 #include <chrono>
 #include <omp.h>
 #include <random>
@@ -35,4 +34,4 @@ extern "C" {
 	DLL_EXPORT int filter_projections_vah(float* data, const float* filter, const float* weights, int order, long pix_y, long num_proj, long pix_x);
 #ifdef __cplusplus
 }
-#endif
+#endif