Merge branch 'master' of https://github.com/flatironinstitute/finufft

ahbarnett · ahbarnett · commit 4d3b2e5995f4 · 2023-08-30T12:59:12.000-04:00
diff --git a/.github/workflows/python_build_win.ps1 b/.github/workflows/python_build_win.ps1
@@ -41,6 +41,8 @@ Copy-Item -Path C:\msys64\mingw64\bin\libgomp-*.dll -Destination ([IO.Path]::Com
 Copy-Item -Path C:\msys64\mingw64\bin\libwinpthread-*.dll -Destination ([IO.Path]::Combine($unpacked_wheel, 'finufft'))
 Copy-Item -Path C:\msys64\mingw64\bin\libfftw3-*.dll -Destination ([IO.Path]::Combine($unpacked_wheel, 'finufft'))
 Copy-Item -Path C:\msys64\mingw64\bin\libfftw3f-*.dll -Destination ([IO.Path]::Combine($unpacked_wheel, 'finufft'))
+Copy-Item -Path C:\msys64\mingw64\bin\libfftw3_omp-*.dll -Destination ([IO.Path]::Combine($unpacked_wheel, 'finufft'))
+Copy-Item -Path C:\msys64\mingw64\bin\libfftw3f_omp-*.dll -Destination ([IO.Path]::Combine($unpacked_wheel, 'finufft'))
 New-Item -Path .\wheelhouse -ItemType Directory -Force
 wheel.exe pack $unpacked_wheel -d .\wheelhouse
 if (-not $?) {throw "Failed pack wheel"}
diff --git a/.github/workflows/python_test_win.ps1 b/.github/workflows/python_test_win.ps1
@@ -1,4 +1,4 @@
-python -m pip install finufft -f .\wheelhouse\
+python -m pip install --pre finufft -f .\wheelhouse\
 if (-not $?) {throw "Failed to pip install finufft"}
 python python/finufft/test/run_accuracy_tests.py
 if (-not $?) {throw "Tests failed"}
diff --git a/.github/workflows/python_wheel.yml b/.github/workflows/python_wheel.yml
@@ -34,7 +34,7 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: linux-wheels
-        path: python/wheelhouse/finufft*manylinux*.whl
+        path: python/finufft/wheelhouse/finufft*manylinux*.whl
 
   MacOS:
     runs-on: macos-latest
@@ -60,19 +60,6 @@ jobs:
         # hack to make libquadmath link statically
         sudo rm /usr/local/opt/gcc@11/lib/gcc/11/libquadmath.*dylib
 
-    - name: Cache macOS Python binaries
-      id: cache-python
-      uses: actions/cache@v3
-      with:
-        path: |
-          /Library/Frameworks/Python.framework/Versions/3.6
-          /Library/Frameworks/Python.framework/Versions/3.7
-          /Library/Frameworks/Python.framework/Versions/3.8
-          /Library/Frameworks/Python.framework/Versions/3.9
-          /Library/Frameworks/Python.framework/Versions/3.10
-          /Library/Frameworks/Python.framework/Versions/3.11
-        key: macos-python-3.6.8-macosx10.9-python3.7.9-macosx10.9-python3.8.3-macosx10.9-python3.9.7-macos11-python3.10.1-macos11-python3.11.0-macos11
-
     # Download and install Python instead of using the setup_python
     # as the python interpreters in the Github machines
     # were compiled in 10.14, the wheels built with them
@@ -138,30 +125,30 @@ jobs:
         PYTHON_BIN=/Library/Frameworks/Python.framework/Versions/3.11/bin/
         $PYTHON_BIN/python3 -m pip install delocate
         ls wheelhouse/finufft*.whl | xargs -n1 $PYTHON_BIN/delocate-wheel -w fixed_wheel/
-        /Library/Frameworks/Python.framework/Versions/3.6/bin/python3 -m pip install finufft -f fixed_wheel/
+        /Library/Frameworks/Python.framework/Versions/3.6/bin/python3 -m pip install --pre finufft -f fixed_wheel/
         /Library/Frameworks/Python.framework/Versions/3.6/bin/python3 test/run_accuracy_tests.py
         /Library/Frameworks/Python.framework/Versions/3.6/bin/python3 examples/simple1d1.py
-        /Library/Frameworks/Python.framework/Versions/3.7/bin/python3 -m pip install finufft -f fixed_wheel/
+        /Library/Frameworks/Python.framework/Versions/3.7/bin/python3 -m pip install --pre finufft -f fixed_wheel/
         /Library/Frameworks/Python.framework/Versions/3.7/bin/python3 test/run_accuracy_tests.py
         /Library/Frameworks/Python.framework/Versions/3.7/bin/python3 examples/simple1d1.py
-        /Library/Frameworks/Python.framework/Versions/3.8/bin/python3 -m pip install finufft -f fixed_wheel/
+        /Library/Frameworks/Python.framework/Versions/3.8/bin/python3 -m pip install --pre finufft -f fixed_wheel/
         /Library/Frameworks/Python.framework/Versions/3.8/bin/python3 test/run_accuracy_tests.py
         /Library/Frameworks/Python.framework/Versions/3.8/bin/python3 examples/simple1d1.py
-        /Library/Frameworks/Python.framework/Versions/3.9/bin/python3 -m pip install finufft -f fixed_wheel/
+        /Library/Frameworks/Python.framework/Versions/3.9/bin/python3 -m pip install --pre finufft -f fixed_wheel/
         /Library/Frameworks/Python.framework/Versions/3.9/bin/python3 test/run_accuracy_tests.py
         /Library/Frameworks/Python.framework/Versions/3.9/bin/python3 examples/simple1d1.py
-        /Library/Frameworks/Python.framework/Versions/3.10/bin/python3 -m pip install finufft -f fixed_wheel/
+        /Library/Frameworks/Python.framework/Versions/3.10/bin/python3 -m pip install --pre finufft -f fixed_wheel/
         /Library/Frameworks/Python.framework/Versions/3.10/bin/python3 test/run_accuracy_tests.py
         /Library/Frameworks/Python.framework/Versions/3.10/bin/python3 examples/simple1d1.py
-        /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 -m pip install finufft -f fixed_wheel/
+        /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 -m pip install --pre finufft -f fixed_wheel/
         /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 test/run_accuracy_tests.py
         /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 examples/simple1d1.py
 
     - name: Upload wheels
       uses: actions/upload-artifact@v2
       with:
         name: macos-wheels
-        path: python/fixed_wheel/*.whl
+        path: python/finufft/fixed_wheel/*.whl
 
   Windows:
     runs-on: windows-latest
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.19)
 
-project(finufft VERSION 2.1.0 LANGUAGES C CXX)
+project(finufft VERSION 2.2.0 LANGUAGES C CXX)
 
 set(GNU_LIKE_FRONTENDS AppleClang Clang GNU)
 if(CMAKE_CXX_COMPILER_ID IN_LIST GNU_LIKE_FRONTENDS)
diff --git a/docs/conf.py b/docs/conf.py
@@ -21,10 +21,11 @@
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.path.abspath('../python'))
+sys.path.insert(0, os.path.abspath('../python/finufft'))
+sys.path.insert(0, os.path.abspath('../python/cufinufft'))
 
 # quash sphinx's inevitable failure of C++ lib extension to import...
-autodoc_mock_imports = ['finufft._finufft', 'numpy']
+autodoc_mock_imports = ['finufft._finufft', 'numpy', 'pycuda']
 # The above is not enough for nested import -- forcibly mock them out ahead of time:
 #for name in autodoc_mock_imports:
 #    sys.modules[name] = sphinx.ext.autodoc._MockModule(name, None)
@@ -73,9 +74,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'2.1'
+version = u'2.2'
 # The full version, including alpha/beta/rc tags.
-release = u'2.1.0'
+release = u'2.2.0.dev0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/include/finufft/defs.h b/include/finufft/defs.h
@@ -63,7 +63,7 @@
 // ------------- Library-wide algorithm parameter settings ----------------
 
 // Library version (is a string)
-#define FINUFFT_VER "2.1.0"
+#define FINUFFT_VER "2.2.0.dev0"
 
 // Largest possible kernel spread width per dimension, in fine grid points
 // (used only in spreadinterp.cpp)
diff --git a/matlab/Contents.m b/matlab/Contents.m
@@ -1,5 +1,5 @@
 % FINUFFT: Flatiron Institute Nonuniform Fast Fourier Transform
-% Version 2.1.0
+% Version 2.2.0.dev0
 %
 % Basic and many-vector interfaces
 %   finufft1d1 - 1D complex nonuniform FFT of type 1 (nonuniform to uniform).
diff --git a/python/cufinufft/cufinufft/__init__.py b/python/cufinufft/cufinufft/__init__.py
@@ -3,5 +3,9 @@
 from cufinufft._simple import (nufft1d1, nufft1d2, nufft2d1, nufft2d2,
                                nufft3d1, nufft3d2)
 
-__all__ = ['cufinufft']
-__version__ = '2.2.0dev0'
+__all__ = ["nufft1d1", "nufft1d2",
+           "nufft2d1", "nufft2d2",
+           "nufft3d1", "nufft3d2",
+           "Plan"]
+
+__version__ = '2.2.0.dev0'
diff --git a/python/cufinufft/setup.py b/python/cufinufft/setup.py
@@ -37,7 +37,7 @@
 # Python Package Setup
 setup(
     name='cufinufft',
-    version='2.2.0dev0',
+    version='2.2.0.dev0',
     author='Yu-shuan Melody Shih, Garrett Wright, Joakim Anden, Johannes Blaschke, Alex Barnett',
     author_email='janden-vscholar@flatironinstitute.org',
     url='https://github.com/flatironinstitute/cufinufft',
diff --git a/python/finufft/finufft/__init__.py b/python/finufft/finufft/__init__.py
@@ -17,4 +17,4 @@
 from finufft._interfaces import nufft2d1,nufft2d2,nufft2d3
 from finufft._interfaces import nufft3d1,nufft3d2,nufft3d3
 
-__version__ = '2.1.0'
+__version__ = '2.2.0.dev0'
diff --git a/python/finufft/setup.py b/python/finufft/setup.py
@@ -5,7 +5,7 @@
 # attempt ../make.inc reading (failed) and default finufftdir. 2/25/20
 # Barnett trying to get sphinx.ext.autodoc to work w/ this, 10/5/20
 
-__version__ = '2.1.0'
+__version__ = '2.2.0.dev0'
 
 from setuptools import setup, Extension
 import os
diff --git a/tools/cufinufft/build-library.sh b/tools/cufinufft/build-library.sh
@@ -1,13 +1,15 @@
 #!/usr/bin/env bash
 set -e -u -x
 
-mkdir -p /io/build
+rm -rf /io/build
+mkdir /io/build
 cd /io/build
 
 cmake -D FINUFFT_USE_CUDA=ON \
       -D FINUFFT_USE_CPU=OFF \
       -D FINUFFT_BUILD_TESTS=ON \
       -D CMAKE_CUDA_ARCHITECTURES="35;50;60;70;75;80" \
+      -D CMAKE_CUDA_FLAGS="-Wno-deprecated-gpu-targets" \
       -D BUILD_TESTING=ON \
       ..
 
diff --git a/tools/cufinufft/build-wheels.sh b/tools/cufinufft/build-wheels.sh
@@ -53,7 +53,7 @@ done
 for py_version in ${py_versions[@]}; do
     py_binary=$(get_python_binary ${py_version})
 
-    "${py_binary}/pip" install cufinufft -f /io/wheelhouse
+    "${py_binary}/pip" install --pre cufinufft -f /io/wheelhouse
     "${py_binary}/pip" install pytest
     "${py_binary}/pytest" /io/python/cufinufft/tests
 done
diff --git a/tools/cufinufft/distribution_helper.sh b/tools/cufinufft/distribution_helper.sh
@@ -2,13 +2,13 @@
 
 # Helper Script For Building Wheels
 
-cufinufft_version=1.3
+cufinufft_version=2.2
 manylinux_version=manylinux2014
 cuda_version=11.0
 dockerhub=janden
 
 
-echo "# build the wheel"
+echo "# Build the docker image"
 docker build \
     --file tools/cufinufft/docker/cuda${cuda_version}/Dockerfile-x86_64 \
     --tag ${dockerhub}/cufinufft-${cufinufft_version}-${manylinux_version} .
@@ -21,14 +21,16 @@ docker create \
     --tty \
     --volume $(pwd)/wheelhouse:/io/wheelhouse \
     --env PLAT=${manylinux_version}_x86_64 \
+    --env LIBRARY_PATH="/io/build" \
+    --env LD_LIBRARY_PATH="/io/build" \
     --name cufinufft \
     ${dockerhub}/cufinufft-${cufinufft_version}-${manylinux_version}
 
 docker start cufinufft
 
-echo "# Build the library and install it"
+echo "# Copy the code and build the library"
+docker cp . cufinufft:/io
 docker exec cufinufft /io/tools/cufinufft/build-library.sh
-docker exec cufinufft cp /io/build/libcufinufft.so /usr/lib
 
 echo "# Build the wheels"
 docker exec cufinufft /io/tools/cufinufft/build-wheels.sh
@@ -41,10 +43,8 @@ echo "# Copy the wheels we care about to the dist folder"
 mkdir -p dist
 cp -v wheelhouse/cufinufft-${cufinufft_version}-cp3*${manylinux_version}* dist
 
-
 echo "The following steps should be performed manually for now.\n"
 
-
 echo "# Push to Test PyPI for review/testing"
 echo "#twine upload -r testpypi dist/*"
 echo
diff --git a/tools/finufft/build-wheels-linux.sh b/tools/finufft/build-wheels-linux.sh
@@ -46,7 +46,7 @@ done
 
 # test wheel
 for pybin in "${pys[@]}"; do
-    "${pybin}/pip" install finufft -f ./python/finufft/wheelhouse/
+    "${pybin}/pip" install --pre finufft -f ./python/finufft/wheelhouse/
     "${pybin}/python" ./python/finufft/test/run_accuracy_tests.py
     "${pybin}/python" ./python/finufft/examples/simple1d1.py
 done

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-python -m pip install finufft -f .\wheelhouse\`
	`1`	`+python -m pip install --pre finufft -f .\wheelhouse\`
`2`	`2`	`if (-not $?) {throw "Failed to pip install finufft"}`
`3`	`3`	`python python/finufft/test/run_accuracy_tests.py`
`4`	`4`	`if (-not $?) {throw "Tests failed"}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`% FINUFFT: Flatiron Institute Nonuniform Fast Fourier Transform`
`2`		`-% Version 2.1.0`
	`2`	`+% Version 2.2.0.dev0`
`3`	`3`	`%`
`4`	`4`	`% Basic and many-vector interfaces`
`5`	`5`	`% finufft1d1 - 1D complex nonuniform FFT of type 1 (nonuniform to uniform).`