Skip to content

cmake: FindIPP fallback #2148

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

Merged
merged 6 commits into from
Apr 30, 2025
+43 −50
Merged

cmake: FindIPP fallback #2148

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7add998
quick FindIPP
casperdcl Apr 23, 2025
3d9d9e3
bump cmake to fix docker
casperdcl Apr 23, 2025
877fc24
separate FindIPP.cmake
casperdcl Apr 24, 2025
aa4f38e
Revert "bump cmake to fix docker"
casperdcl Apr 24, 2025
74e8ea4
simplify logic
casperdcl Apr 24, 2025
257de66
cmake: find using *_ROOT hints
casperdcl Apr 29, 2025
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
8 changes: 1 addition & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,7 @@
#
# Authors:
# CIL Developers, listed at: https://github.com/TomographicImaging/CIL/blob/master/NOTICE.txt
# Richard Brown (University College London)

if(APPLE)
cmake_minimum_required(VERSION 3.16)
else()
cmake_minimum_required(VERSION 3.5)
endif()
cmake_minimum_required(VERSION 3.20)

project(cil LANGUAGES CXX)

Expand Down
3 changes: 1 addition & 2 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ requirements:
- pip
- setuptools >=64
- setuptools_scm >=8
- cmake # [not osx]
- cmake >=3.16 # [osx]
- cmake >=3.20
- libgcc-ng # [linux]
- libstdcxx-ng # [linux]
- _openmp_mutex # [linux]
Expand Down
6 changes: 3 additions & 3 deletions scripts/create_local_env_for_cil_development.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ echo "Environment name $name"
conda_args=(create --name="$name"
python="$python"
numpy="$numpy"
cmake'>=3.16'
cmake'>=3.20'
dxchange
h5py
ipp'>=2021.10'
Expand Down Expand Up @@ -99,7 +99,7 @@ else
)
fi

conda "${conda_args[@]}"
conda "${conda_args[@]}"
if [[ -n "${pip_install_pkgs[@]}" ]]; then
python -m pip install "${pip_install_pkgs[@]}"
fi
fi
2 changes: 1 addition & 1 deletion scripts/requirements-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies:
- python-wget
- scikit-image
- packaging
- cmake >=3.16
- cmake >=3.20
- setuptools <71
- ipp-include=2021.12
- ipp-devel=2021.12
Expand Down
31 changes: 11 additions & 20 deletions src/Core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,33 +52,24 @@ else()
set (OpenMP_EXE_LINKER_FLAGS ${OpenMP_C_FLAGS})
endif()

if(NOT DEFINED IPP_LIBRARY)
if (UNIX)
set(IPP_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib)
elseif(WIN32)
set(IPP_LIBRARY ${CMAKE_INSTALL_PREFIX}/Library/lib)
endif()
endif()

if(NOT DEFINED IPP_INCLUDE)
set(IPP_INCLUDE ${CMAKE_INSTALL_PREFIX}/include)
endif()

if (UNIX)
find_library(IPP_CORE libippcore.so PATHS ${IPP_LIBRARY})
find_library(IPP_S libipps.so PATHS ${IPP_LIBRARY})
find_library(IPP_VM libippvm.so PATHS ${IPP_LIBRARY})
find_library(IPP_I libippi.so PATHS ${IPP_LIBRARY})
find_library(IPP_CORE libippcore.so)
find_library(IPP_S libipps.so)
find_library(IPP_VM libippvm.so)
find_library(IPP_I libippi.so)
elseif(WIN32)
find_library(IPP_CORE ippcore PATHS ${IPP_LIBRARY})
find_library(IPP_S ipps PATHS ${IPP_LIBRARY})
find_library(IPP_VM ippvm PATHS ${IPP_LIBRARY})
find_library(IPP_I ippi PATHS ${IPP_LIBRARY})
find_library(IPP_CORE ippcore)
find_library(IPP_S ipps)
find_library(IPP_VM ippvm)
find_library(IPP_I ippi)
endif()

if(IPP_CORE AND IPP_S AND IPP_VM AND IPP_I)
set(USE_IPP TRUE)
message("IPP libraries found")
file(REAL_PATH ${IPP_CORE}/../.. LIB_BASE)
find_file(IPP_INCLUDE ipp.h ${LIB_BASE} PATH_SUFFIXES include include/ipp)
cmake_path(GET IPP_INCLUDE PARENT_PATH IPP_INCLUDE)
else()
set(USE_IPP FALSE)
message("IPP libraries not found, FBP_filtering not in build")
Expand Down
Loading