diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b12ee5..b076bed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15...3.27) +cmake_minimum_required(VERSION 3.19...3.30) project(${SKBUILD_PROJECT_NAME} LANGUAGES C CXX) message(STATUS "Using CMake version: " ${CMAKE_VERSION}) @@ -19,6 +19,7 @@ if(JAX_FINUFFT_USE_OPENMP) set(FINUFFT_USE_OPENMP OFF) endif() else() + message(STATUS "jax_finufft: OpenMP support was not requested") set(FINUFFT_USE_OPENMP OFF) endif() @@ -58,7 +59,7 @@ endif() # Build the CPU XLA bindings nanobind_add_module(jax_finufft_cpu ${CMAKE_CURRENT_LIST_DIR}/lib/jax_finufft_cpu.cc) -target_link_libraries(jax_finufft_cpu PRIVATE finufft_static) +target_link_libraries(jax_finufft_cpu PRIVATE finufft) install(TARGETS jax_finufft_cpu LIBRARY DESTINATION .) if(FINUFFT_USE_OPENMP) @@ -85,6 +86,6 @@ if(FINUFFT_USE_CUDA) ${CMAKE_CURRENT_LIST_DIR}/lib/kernels.cc.cu) target_include_directories(jax_finufft_gpu PUBLIC ${CUFINUFFT_INCLUDE_DIRS}) target_include_directories(jax_finufft_gpu PUBLIC ${CUFINUFFT_VENDORED_INCLUDE_DIRS}) - target_link_libraries(jax_finufft_gpu PRIVATE cufinufft_static) + target_link_libraries(jax_finufft_gpu PRIVATE cufinufft) install(TARGETS jax_finufft_gpu LIBRARY DESTINATION .) endif() diff --git a/pyproject.toml b/pyproject.toml index c9f81da..9052343 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,6 +38,7 @@ version_file = "src/jax_finufft/jax_finufft_version.py" [tool.cibuildwheel] skip = "pp* *-musllinux_* *-manylinux_i686" build-verbosity = 1 +config-settings = {"cmake.define.FINUFFT_ARCH_FLAGS" = ""} [tool.cibuildwheel.linux] before-all = "yum install -y fftw-devel" diff --git a/vendor/finufft b/vendor/finufft index 5189205..fddad84 160000 --- a/vendor/finufft +++ b/vendor/finufft @@ -1 +1 @@ -Subproject commit 51892059a4b457a99a2569ac11e9e91cd2e289e7 +Subproject commit fddad8441a630660dc6966b2fa95ef130984ad55