Merge remote-tracking branch 'upstream/master' into cuda

Author: blackwer

docs/devnotes.rst

@@ -9,6 +9,7 @@ Developer notes
 
   - ``docs/conf.py`` for sphinx
   - ``python/setup.py`` for the python pkg version
+  - ``python/finufft/__init__.py``
   - ``include/finufft/defs.h``
   - ``matlab/Contents.m``
   - ``CHANGELOG``: don't forget to describe the new features and changes, folding lines at 80 chars.

include/finufft_opts.h

@@ -35,7 +35,16 @@ typedef struct finufft_opts{  // defaults see finufft.cpp:finufft_default_opts()
 
 // Those of the above of the form spread_* indicate pass through to finufft_spread_opts
 
-// Backwards-compatibility, with a warning in C (officially C23) or C++14...
-[[deprecated ("as of v2.1.0, nufft_opts is obsolete and renamed finufft_opts; please use this instead.")]] typedef finufft_opts nufft_opts;
+// define deprecated opts macro
+#if defined(__cplusplus) && (__cplusplus >= 201402L)
+#define DEPRECATED_OPTS [[deprecated ("as of v2.1.0, nufft_opts is obsolete and renamed finufft_opts; please use this instead.")]]
+#elif defined(_MSC_VER)
+#define DEPRECATED_OPTS __declspec(deprecated("as of v2.1.0, nufft_opts is obsolete and renamed finufft_opts; please use this instead."))
+#else
+#define DEPRECATED_OPTS __attribute__((deprecated("as of v2.1.0, nufft_opts is obsolete and renamed finufft_opts; please use this instead.")))
+#endif
+
+// Backwards-compatibility
+DEPRECATED_OPTS typedef finufft_opts nufft_opts;
 
 #endif  // FINUFFT_OPTS_H

make.inc.macosx_arm64

@@ -0,0 +1,45 @@
+# Makefile variable overrides for Mac OSX compilation with CLANG.
+#
+# Note that we have not been able to link against gfortran, so if you need
+# fortran interfaces, use make.inc.macosx_gcc-* instead.
+#
+# Copy this file to make.inc, and if needed edit for your setup.
+# Barnett 10/27/18. Input from Yu-Hsuan Shih, Amit Moskovich.
+
+# (note that /usr/bin/g++,gcc are aliased to clang/LLVM, so CXX,CC unchanged)
+
+# compile flags for use with clang: (note absence of -march, etc)
+CFLAGS = -O3 -arch arm64
+
+# If you're getting warning messages of the form:
+#    ld: warning: object file (lib-static/libfinufft.a(finufft1d.o)) was built for
+#    newer OSX version (10.13) than being linked (10.9)
+# Then you can uncomment the following two lines with the older version number
+# (in this example -mmacosx-version-min=10.9)
+#
+#CFLAGS += "-mmacosx-version-min=<OLDER OSX VERSION NUMBER>"
+
+CXX=clang++
+CC=clang
+
+# taken from makefile...
+CFLAGS   += -I include -I/usr/local/include -I/opt/homebrew/include
+FFLAGS   = $(CFLAGS)
+CXXFLAGS = $(CFLAGS)
+LIBS += -L/usr/local/lib
+
+# OpenMP with clang needs following...
+OMPFLAGS = -Xpreprocessor -fopenmp
+OMPLIBS = -L/usr/local/lib -L/opt/homebrew/lib -lomp
+# since fftw3_omp doesn't work in OSX, we need...
+FFTWOMPSUFFIX=threads
+
+
+# MATLAB interface: this will probably segfault. Instead we suggest you use
+# make.inc.macosx_clang_matlab
+
+# Some of these will depend on your FFTW library location...
+MFLAGS += -I/usr/local/include -L/usr/local/lib -lm
+# may need to edit for your MATLAB version location...
+MEX = $(shell ls -d /Applications/MATLAB_R20**.app)/bin/mex
+# Also see docs/install.rst for possible edits to MATLAB's MEX XML file.

python/finufft/__init__.py

@@ -16,3 +16,5 @@
 from finufft._interfaces import nufft1d1,nufft1d2,nufft1d3
 from finufft._interfaces import nufft2d1,nufft2d2,nufft2d3
 from finufft._interfaces import nufft3d1,nufft3d2,nufft3d3
+
+__version__ = '2.1.0'