try to fix conflicts

.github/workflows/python_build_wheels.yml

@@ -18,15 +18,22 @@ jobs:
         with:
           package-dir: 'python/finufft'
         env:
-          CIBW_BEFORE_ALL_MACOS: brew install gcc@14 fftw
+          CIBW_BEFORE_ALL_MACOS: |
+            # In order to reinstall a version of GCC compatible with older versions of macOS, we need to first uninstall the existing version.
+            brew uninstall gcc
+            pkg=$(brew fetch --force --bottle-tag=monterey gcc | grep 'Downloaded to' | cut -d' ' -f3)
+            brew install $pkg
+
+            pkg=$(brew fetch --force --bottle-tag=monterey fftw | grep 'Downloaded to' | cut -d' ' -f3)
+            brew install $pkg
           CIBW_ARCHS_MACOS: "x86_64"
           # Need following versions of GCC for compatibility with fftw
           # installed by homebrew. Similarly, we set the macOS version
           # for compatibility with those libraries.
           CIBW_ENVIRONMENT_MACOS: >
             CC=gcc-14
             CXX=g++-14
-            MACOSX_DEPLOYMENT_TARGET=13
+            MACOSX_DEPLOYMENT_TARGET=12
 
       - uses: actions/upload-artifact@v4
         with:
@@ -46,18 +53,18 @@ jobs:
           package-dir: 'python/finufft'
         env:
           CIBW_ARCHS_MACOS: "arm64"
-          # Make sure to install the ARM64-specific versions of FFTW and GCC.
-          # Perhaps this is done automatically on the macos-14 image. We should
-          # look into this further.
           CIBW_BEFORE_ALL_MACOS: |
-            pkg=$(brew fetch --force --bottle-tag=arm64_ventura fftw | grep 'Downloaded to' | cut -d' ' -f3)
+            # In order to reinstall a version of GCC compatible with older versions of macOS, we need to first uninstall the existing version.
+            brew uninstall gcc
+            pkg=$(brew fetch --force --bottle-tag=arm64_monterey gcc | grep 'Downloaded to' | cut -d' ' -f3)
             brew install $pkg
-            pkg=$(brew fetch --force --bottle-tag=arm64_ventura gcc | grep 'Downloaded to' | cut -d' ' -f3)
+
+            pkg=$(brew fetch --force --bottle-tag=arm64_monterey fftw | grep 'Downloaded to' | cut -d' ' -f3)
             brew install $pkg
           CIBW_ENVIRONMENT_MACOS: >
             CC=gcc-14
             CXX=g++-14
-            MACOSX_DEPLOYMENT_TARGET=14
+            MACOSX_DEPLOYMENT_TARGET=12
 
       - uses: actions/upload-artifact@v4
         with:
@@ -85,11 +92,6 @@ jobs:
         uses: pypa/[email protected]
         with:
           package-dir: 'python/finufft'
-        env:
-          # This is required to force cmake to avoid using MSVC (the default).
-          # By setting the generator to Ninja, cmake will pick gcc (mingw64)
-          # as the compiler.
-          CIBW_CONFIG_SETTINGS: "cmake.args='-G Ninja'"
 
       - uses: actions/upload-artifact@v4
         with:

CHANGELOG

@@ -1,7 +1,7 @@
 List of features / changes made / release notes, in reverse chronological order.
 If not stated, FINUFFT is assumed (cuFINUFFT <=1.3 is listed separately).
 
-V 2.3.0-rc1 (8/6/24)
+V 2.3.0 (9/5/24)
 
 * Switched C++ standards from C++14 to C++17, allowing various templating
   improvements (Barbone).
@@ -72,6 +72,9 @@ V 2.3.0-rc1 (8/6/24)
   test/finufft?d_test.cpp to reduce CI fails due to random numbers on some
   platforms in single-prec (with DUCC, etc). (Barnett PR516)
 * fix GPU segfault due to stream deletion as pointer not value (Barbone PR520)
+* new performance-tracking doc page comparing releases (Barbone) #527
+* fix various Py 3.8 wheel and numpy distutils logging issues #549 #545
+* Cmake option to control -fPIC in static build; default now ON (as v2.2) #551
 
 V 2.2.0 (12/12/23)
 

CMakeLists.txt

@@ -14,11 +14,12 @@ include(CMakeDependentOption)
 option(FINUFFT_BUILD_FORTRAN "Whether to build the FINUFFT Fortran examples" OFF)
 option(FINUFFT_BUILD_MATLAB "Whether to build the FINUFFT Matlab interface" OFF)
 option(FINUFFT_BUILD_PYTHON "Whether the Python wrapper should be built." OFF)
-option(FINUFFT_ENABLE_SANITIZERS "Whether to enable sanitizers, only effective for Debug configuration." ON)
+option(FINUFFT_ENABLE_SANITIZERS "Whether to enable sanitizers, only effective for Debug configuration." OFF)
 option(FINUFFT_USE_OPENMP "Whether to use OpenMP for parallelization. If disabled, the finufft library will be single threaded. This does not affect the choice of FFTW library." ON)
 option(FINUFFT_USE_CPU "Whether to build the ordinary FINUFFT library (libfinufft)." ON)
 option(FINUFFT_USE_CUDA "Whether to build CUDA accelerated FINUFFT library (libcufinufft). This is completely independent of the main FINUFFT library" OFF)
 option(FINUFFT_STATIC_LINKING "If ON builds the static finufft library, if OFF build a shared finufft library." ON)
+option(FINUFFT_POSITION_INDEPENDENT_CODE "Whether to build the finufft library with position independent code (-fPIC). This forced ON when FINUFFT_SHARED_LINKING is ON." ON)
 option(FINUFFT_BUILD_DEVEL "Whether to build development executables" OFF)
 option(FINUFFT_BUILD_EXAMPLES "Whether to build the FINUFFT examples" OFF)
 option(FINUFFT_BUILD_TESTS "Whether to build the FINUFFT tests" OFF)
@@ -32,11 +33,16 @@ set(FINUFFT_CUDA_ARCHITECTURES "native" CACHE STRING "CUDA architectures to buil
 # if FINUFFT_USE_CPU is OFF, the following options are ignored
 set(FINUFFT_ARCH_FLAGS "native" CACHE STRING "Compiler flags for specifying target architecture, defaults to -march=native")
 # sphinx tag (don't remove): @cmake_opts_end
-cmake_dependent_option(FINUFFT_ENABLE_INSTALL "Disable installation in the case of python builds" OFF "FINUFFT_BUILD_PYTHON" OFF)
+cmake_dependent_option(FINUFFT_ENABLE_INSTALL "Disable installation in the case of python builds" ON "NOT FINUFFT_BUILD_PYTHON" OFF)
 cmake_dependent_option(FINUFFT_STATIC_LINKING "Disable static libraries in the case of python builds" ON "NOT FINUFFT_BUILD_PYTHON" OFF)
 cmake_dependent_option(FINUFFT_SHARED_LINKING "Shared should be the opposite of static linking" ON "NOT FINUFFT_STATIC_LINKING" OFF)
 # cmake-format: on
 
+# When building shared libraries, we need to build with -fPIC in all cases
+if(FINUFFT_SHARED_LINKING)
+  set(FINUFFT_POSITION_INDEPENDENT_CODE ON)
+endif()
+
 include(cmake/utils.cmake)
 
 set(FINUFFT_CXX_FLAGS_RELEASE
@@ -117,7 +123,13 @@ endif()
 # double precision The single precision compilation is done with -DSINGLE
 set(FINUFFT_PRECISION_DEPENDENT_SOURCES
     src/finufft.cpp src/fft.cpp src/simpleinterfaces.cpp src/spreadinterp.cpp
-    src/utils.cpp fortran/finufftfort.cpp)
+    src/utils.cpp)
+
+# If we're building for Fortran, make sure we also include the translation
+# layer.
+if(FINUFFT_BUILD_FORTRAN)
+  list(APPEND FINUFFT_PRECISION_DEPENDENT_SOURCES fortran/finufftfort.cpp)
+endif()
 
 # set linker flags for sanitizer
 set(FINUFFT_SANITIZER_FLAGS)
@@ -137,7 +149,7 @@ function(enable_asan target)
   endif()
 endfunction()
 
-set(CPM_DOWNLOAD_VERSION 0.40.0)
+set(CPM_DOWNLOAD_VERSION 0.40.2)
 include(cmake/setupCPM.cmake)
 
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
@@ -225,7 +237,7 @@ function(set_finufft_options target)
   set_target_properties(
     ${target}
     PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>"
-               POSITION_INDEPENDENT_CODE ${FINUFFT_SHARED_LINKING})
+               POSITION_INDEPENDENT_CODE ${FINUFFT_POSITION_INDEPENDENT_CODE})
   enable_asan(${target})
   if(FINUFFT_USE_OPENMP)
     target_link_libraries(${target} PRIVATE OpenMP::OpenMP_CXX)
@@ -280,13 +292,17 @@ if(FINUFFT_USE_CPU)
 endif()
 
 if(FINUFFT_USE_CUDA)
-  if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES)
-    message(
-      "FINUFFT WARNING: No CUDA architecture supplied via '-DCMAKE_CUDA_ARCHITECTURES=...', defaulting to 'native'"
-    )
-    message(
-      "See: https://developer.nvidia.com/cuda-gpus for more details on what architecture to supply."
-    )
+  if(NOT DEFINED FINUFFT_CUDA_ARCHITECTURES)
+    if(DEFINED CMAKE_CUDA_ARCHITECTURES)
+      set(FINUFFT_CUDA_ARCHITECTURES "{$CMAKE_CUDA_ARCHITECTURES}")
+    else()
+      message(
+        "FINUFFT WARNING: No CUDA architecture supplied via '-DFINUFFT_CUDA_ARCHITECTURES=...', defaulting to 'native'"
+      )
+      message(
+        "See: https://developer.nvidia.com/cuda-gpus for more details on what architecture to supply."
+      )
+    endif()
   endif()
   enable_language(CUDA)
   find_package(CUDAToolkit REQUIRED)
@@ -332,12 +348,14 @@ if(FINUFFT_BUILD_PYTHON)
   add_subdirectory(python)
 endif()
 
-message(STATUS " CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+# cmake-format: off
 message(STATUS "FINUFFT configuration summary:")
+message(STATUS "  CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
 message(STATUS "  FINUFFT_USE_CPU: ${FINUFFT_USE_CPU}")
 message(STATUS "  FINUFFT_USE_CUDA: ${FINUFFT_USE_CUDA}")
 message(STATUS "  FINUFFT_USE_OPENMP: ${FINUFFT_USE_OPENMP}")
 message(STATUS "  FINUFFT_STATIC_LINKING: ${FINUFFT_STATIC_LINKING}")
+message(STATUS "  FINUFFT_POSITION_INDEPENDENT_CODE: ${FINUFFT_POSITION_INDEPENDENT_CODE}")
 message(STATUS "  FINUFFT_ENABLE_INSTALL: ${FINUFFT_ENABLE_INSTALL}")
 message(STATUS "  FINUFFT_BUILD_EXAMPLES: ${FINUFFT_BUILD_EXAMPLES}")
 message(STATUS "  FINUFFT_BUILD_TESTS: ${FINUFFT_BUILD_TESTS}")
@@ -349,7 +367,7 @@ message(STATUS "  FINUFFT_FFTW_SUFFIX: ${FINUFFT_FFTW_SUFFIX}")
 message(STATUS "  FINUFFT_FFTW_LIBRARIES: ${FINUFFT_FFTW_LIBRARIES}")
 message(STATUS "  FINUFFT_ARCH_FLAGS: ${FINUFFT_ARCH_FLAGS}")
 message(STATUS "  FINUFFT_USE_DUCC0: ${FINUFFT_USE_DUCC0}")
-
+# cmake-format: on
 if(FINUFFT_ENABLE_INSTALL)
   include(GNUInstallDirs)
   install(TARGETS ${INSTALL_TARGETS} PUBLIC_HEADER)

Jenkinsfile

@@ -59,7 +59,7 @@ pipeline {
       source $HOME/bin/activate
       python3 -m pip install --no-cache-dir --upgrade pycuda cupy-cuda112 numba
       python3 -m pip install --no-cache-dir torch==1.12.1+cu113 -f https://download.pytorch.org/whl/torch_stable.html
-      python3 -m pip install --no-cache-dir pytest
+      python3 -m pip install --no-cache-dir pytest pytest-mock
       python -c "from numba import cuda; cuda.cudadrv.libs.test()"
       python3 -m pytest --framework=pycuda python/cufinufft
       python3 -m pytest --framework=numba python/cufinufft

LICENSE

@@ -1,6 +1,6 @@
-Copyright (C) 2017-2023 The Simons Foundation, Inc. - All Rights Reserved.
+Copyright (C) 2017-2024 The Simons Foundation, Inc. - All Rights Reserved.
 
-Lead developer: Alex H. Barnett; see docs/ackn.rst for other contributors.
+See docs/ackn.rst for the list of code authors and contributors.
 
 ------
 
@@ -29,16 +29,22 @@ tutorial/utils/lgwt.m
 
 If you find this library useful, or it helps you in creating software
 or publications, please let us know, and acknowledge that fact by citing our
-repository:
+source repository:
 
   https://github.com/flatironinstitute/finufft
 
-and the corresponding journal articles (particularly the first):
+and the corresponding journal articles (particularly the first for the CPU
+and/or the last for the GPU):
 
   A parallel non-uniform fast Fourier transform library based on an
   ``exponential of semicircle'' kernel. A. H. Barnett, J. F. Magland,
   and L. af Klinteberg.  SIAM J. Sci. Comput. 41(5), C479-C504 (2019).
 
-  Aliasing error of the exp$(\beta \sqrt{1-z^2})$ kernel in the
+  Aliasing error of the $\exp (\beta \sqrt{1-z^2})$ kernel in the
   nonuniform fast Fourier transform. A. H. Barnett,
   Appl. Comput. Harmon. Anal. 51, 1-16 (2021).
+
+  cuFINUFFT: a load-balanced GPU library for general-purpose nonuniform FFTs,
+  Yu-hsuan Shih, Garrett Wright, Joakim Andén, Johannes Blaschke, and
+  Alex H. Barnett. PDSEC2021 workshop of the IPDPS2021 conference.
+  https://arxiv.org/abs/2102.08463

cmake/setupDUCC.cmake

@@ -29,7 +29,7 @@ if(ducc0_ADDED)
   set_target_properties(
     ducc0
     PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>"
-               POSITION_INDEPENDENT_CODE ${FINUFFT_SHARED_LINKING})
+               POSITION_INDEPENDENT_CODE ${FINUFFT_POSITION_INDEPENDENT_CODE})
   check_cxx_compiler_flag(-ffast-math HAS_FAST_MATH)
   if(HAS_FAST_MATH)
     target_compile_options(ducc0 PRIVATE -ffast-math)

cmake/setupFFTW.cmake

@@ -72,7 +72,8 @@ if(FINUFFT_FFTW_LIBRARIES STREQUAL DEFAULT OR FINUFFT_FFTW_LIBRARIES STREQUAL
       set_target_properties(
         ${element}
         PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>"
-                   POSITION_INDEPENDENT_CODE ${FINUFFT_SHARED_LINKING})
+                   POSITION_INDEPENDENT_CODE
+                   ${FINUFFT_POSITION_INDEPENDENT_CODE})
     endforeach()
 
     target_include_directories(

cmake/utils.cmake

@@ -1,18 +1,17 @@
 include(CheckCXXCompilerFlag)
+
 # Define the function
 function(filter_supported_compiler_flags input_flags_var output_flags_var)
   # Create an empty list to store supported flags
   set(supported_flags)
-
   # Iterate over each flag in the input list
+  set(ORIGINAL_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS})
   foreach(flag ${${input_flags_var}})
     string(REPLACE "=" "_" flag_var ${flag}) # Convert flag to a valid variable
     # name
     string(REPLACE "-" "" flag_var ${flag_var}) # Remove '-' for the variable
-    # name
-
-    # Append the test linker flag to the existing flags
-    list(APPEND CMAKE_EXE_LINKER_FLAGS ${flag})
+    # name Append the test linker flag to the existing flags
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${flag}")
     check_cxx_compiler_flag(${flag} ${flag_var})
     if(${flag_var})
       # If supported, append the flag to the list of supported flags
@@ -21,8 +20,8 @@ function(filter_supported_compiler_flags input_flags_var output_flags_var)
       message(STATUS "Flag ${flag} is not supported")
     endif()
     unset(${flag_var} CACHE)
-    # remove last flag from linker flags
-    list(REMOVE_ITEM CMAKE_EXE_LINKER_FLAGS ${flag})
+    # remove last flag from CMAKE_EXE_LINKER_FLAGS using substring
+    set(CMAKE_EXE_LINKER_FLAGS ${ORIGINAL_LINKER_FLAGS})
   endforeach()
   # Set the output variable to the list of supported flags
   set(${output_flags_var}

devel/README

@@ -21,4 +21,7 @@ Tweaks should be done here, and see instructions there for resulting acc test.
 Another code that has to match ../src/spreadinterp.cpp is:
 reverse_engineer_tol.m
 
-Barnett 7/22/24
+Re measuring overall accuracy, to compare kernels, make matlab, and run:
+matlab/test/fig_accuracy.m
+
+Barnett 8/20/24

docs/conf.py

@@ -74,9 +74,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'2.3-rc1'
+version = u'2.3'
 # The full version, including alpha/beta/rc tags.
-release = u'2.3.0-rc1'
+release = u'2.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/devnotes.rst

@@ -5,7 +5,9 @@ Developer notes
 
 * Developers needing to update/regenerate documentation in general, including our readthedocs website, see ``docs/README``. Developers changing MATLAB/octave interfaces or docs, also see ``matlab/README``. Please also see ``contributing.md`` for code style and git hook guidelines.
 
-* To update the version number, this needs to be done by hand in the following places:
+* FINUFFT is by default built with position-independent code (``-fPIC`` compile flag), by both the Makefile and CMake. See CMake options to change this for the static library. Developers changing the FINUFFT source code should use ``static`` functions unless they need to export the symbol; this will prevent performance degradation when using ``-fPIC``.
+
+* To update the version number, this needs to be done by hand in the following places (we decided that a version-bump script is not worth the hassle):
 
   - ``CMakeLists.txt`` for cmake
   - ``docs/conf.py`` for sphinx
@@ -23,7 +25,8 @@ Developer notes
 
 * If you add a new option field (recall it must be plain C style only, no special types) to ``include/finufft_opts.h``, don't forget to add it to ``include/finufft.fh``, ``include/finufft_mod.f90``, ``matlab/finufft.mw``, ``python/finufft/_finufft.py``, and the Julia interface, as well a paragraph describing its use in the docs. Also to set its default value in ``src/finufft.cpp``. You will then need to regenerate the docs as in ``docs/README``.
 
-* For testing and performance measuring routines see ``test/README`` and ``perftest/README``. We need more of the latter, eg, something making performance graphs that enable rapid eyeball comparison of various settings/machines. Marco is working on that.
+* For basic testing and performance measuring routines see ``test/README`` and ``perftest/README``.
+  To generate sets of performance graphs that enable rapid eyeball comparison between releases, see  the :ref:`performance page <performance>` with graphs currently generated by ``perftest/bench.py``.
 
 * The kernel function in spreadinterp is evaluated via piecewise-polynomial approximation (Horner's rule). The code for this is auto-generated in MATLAB, for all upsampling factors. There are two versions supported:
 

docs/index.rst

@@ -13,23 +13,24 @@ Flatiron Institute Nonuniform Fast Fourier Transform
 
 
 Documentation contents
-========================             
-             
+========================
+
 .. toctree::
    :maxdepth: 3
 
    install
    install_gpu
    dirs
    math
-   cex           
+   cex
    c
    c_gpu
    opts
    error
    trouble
+   performance
    tut
-   fortran          
+   fortran
    matlab
    python
    python_gpu
@@ -42,5 +43,3 @@ Documentation contents
    users
    ackn
    refs
-
-