Skip to content

Commit

Permalink
Update the upstream version of finufft
Browse files Browse the repository at this point in the history
  • Loading branch information
dfm committed Aug 30, 2024
1 parent 687c9a3 commit ea9cbca
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
7 changes: 4 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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})

Expand All @@ -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()

Expand Down Expand Up @@ -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)
Expand All @@ -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()
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion vendor/finufft
Submodule finufft updated 264 files

0 comments on commit ea9cbca

Please sign in to comment.