Skip to content

Commit

Permalink
cmake: use FINUFFT_POSITION_INDEPENDENT_CODE, update vendored finufft…
Browse files Browse the repository at this point in the history
  • Loading branch information
lgarrison committed Sep 5, 2024
1 parent db882ce commit cd5d784
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
8 changes: 2 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,10 @@ else()
set(FINUFFT_USE_CUDA OFF)
endif()

set(FINUFFT_POSITION_INDEPENDENT_CODE ON)

# Add the FINUFFT project using the vendored version
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/vendor/finufft")
set_property(TARGET finufft PROPERTY POSITION_INDEPENDENT_CODE ON)
set_property(TARGET finufft_f32 PROPERTY POSITION_INDEPENDENT_CODE ON)
set_property(TARGET finufft_f64 PROPERTY POSITION_INDEPENDENT_CODE ON)

# Find Python and nanobind
find_package(Python 3.8 COMPONENTS Interpreter Development.Module REQUIRED)
Expand All @@ -73,9 +72,6 @@ endif()
if(FINUFFT_USE_CUDA)
enable_language(CUDA)
set(CMAKE_CUDA_SEPARABLE_COMPILATION ON)
set_property(TARGET cufinufft_common_objects PROPERTY POSITION_INDEPENDENT_CODE ON)
set_property(TARGET cufinufft_objects PROPERTY POSITION_INDEPENDENT_CODE ON)
set_property(TARGET cufinufft PROPERTY POSITION_INDEPENDENT_CODE ON)

# TODO(dfm): The ${CUFINUFFT_INCLUDE_DIRS} variable doesn't seem to get set
# properly when FINUFFT is included as a submodule (maybe because of the use
Expand Down
2 changes: 1 addition & 1 deletion vendor/finufft
Submodule finufft updated 62 files
+0 −5 .github/workflows/python_build_wheels.yml
+11 −3 CMakeLists.txt
+11 −5 LICENSE
+1 −1 cmake/setupDUCC.cmake
+2 −1 cmake/setupFFTW.cmake
+4 −1 devel/README
+3 −2 docs/devnotes.rst
+5 −6 docs/index.rst
+4 −4 docs/overview.src
+123 −0 docs/performance.rst
+ docs/pics/10000x1x1-type-1-upsamp1.25-precd-thread1.png
+ docs/pics/10000x1x1-type-1-upsamp1.25-precf-thread1.png
+ docs/pics/10000x1x1-type-1-upsamp2.00-precd-thread1.png
+ docs/pics/10000x1x1-type-1-upsamp2.00-precf-thread1.png
+ docs/pics/10000x1x1-type-2-upsamp1.25-precd-thread1.png
+ docs/pics/10000x1x1-type-2-upsamp1.25-precf-thread1.png
+ docs/pics/10000x1x1-type-2-upsamp2.00-precd-thread1.png
+ docs/pics/10000x1x1-type-2-upsamp2.00-precf-thread1.png
+ docs/pics/10000x1x1-type-3-upsamp1.25-precd-thread1.png
+ docs/pics/10000x1x1-type-3-upsamp1.25-precf-thread1.png
+ docs/pics/10000x1x1-type-3-upsamp2.00-precd-thread1.png
+ docs/pics/10000x1x1-type-3-upsamp2.00-precf-thread1.png
+ docs/pics/192x192x128-type-1-upsamp1.25-precf-thread32.png
+ docs/pics/192x192x128-type-1-upsamp2.00-precf-thread32.png
+ docs/pics/192x192x128-type-2-upsamp1.25-precf-thread32.png
+ docs/pics/192x192x128-type-2-upsamp2.00-precf-thread32.png
+ docs/pics/192x192x128-type-3-upsamp1.25-precf-thread32.png
+ docs/pics/192x192x128-type-3-upsamp2.00-precf-thread32.png
+ docs/pics/320x320x1-type-1-upsamp1.25-precd-thread1.png
+ docs/pics/320x320x1-type-1-upsamp1.25-precf-thread1.png
+ docs/pics/320x320x1-type-1-upsamp1.25-precf-thread32.png
+ docs/pics/320x320x1-type-1-upsamp2.00-precd-thread1.png
+ docs/pics/320x320x1-type-1-upsamp2.00-precf-thread1.png
+ docs/pics/320x320x1-type-1-upsamp2.00-precf-thread32.png
+ docs/pics/320x320x1-type-2-upsamp1.25-precd-thread1.png
+ docs/pics/320x320x1-type-2-upsamp1.25-precf-thread1.png
+ docs/pics/320x320x1-type-2-upsamp1.25-precf-thread32.png
+ docs/pics/320x320x1-type-2-upsamp2.00-precd-thread1.png
+ docs/pics/320x320x1-type-2-upsamp2.00-precf-thread1.png
+ docs/pics/320x320x1-type-2-upsamp2.00-precf-thread32.png
+ docs/pics/320x320x1-type-3-upsamp1.25-precd-thread1.png
+ docs/pics/320x320x1-type-3-upsamp1.25-precf-thread1.png
+ docs/pics/320x320x1-type-3-upsamp1.25-precf-thread32.png
+ docs/pics/320x320x1-type-3-upsamp2.00-precd-thread1.png
+ docs/pics/320x320x1-type-3-upsamp2.00-precf-thread1.png
+ docs/pics/320x320x1-type-3-upsamp2.00-precf-thread32.png
+9 −7 docs/trouble.rst
+14 −4 perftest/CMakeLists.txt
+226 −0 perftest/bench.py
+357 −0 perftest/perftest.cpp
+15 −0 python/cufinufft/cufinufft/_cufinufft.py
+14 −0 python/finufft/finufft/_finufft.py
+17 −1 python/finufft/pyproject.toml
+5 −2 src/cuda/CMakeLists.txt
+14 −6 src/spreadinterp.cpp
+32 −41 tools/cufinufft/distribution_helper.sh
+5 −0 tools/cufinufft/docker/README
+9 −0 tools/cufinufft/docker/cuda11.2/Dockerfile-x86_64
+0 −6 tools/cufinufft/docker/cuda11.2/README
+74 −0 tools/cufinufft/docker/cuda11.8/Dockerfile-x86_64
+6 −0 tools/cufinufft/docker/cuda11.8/cuda.repo
+6 −27 tools/cufinufft/docker/cuda12.0/Dockerfile-x86_64

0 comments on commit cd5d784

Please sign in to comment.