removed obsolete NEED_EXTERN_C flag, fixes #90

Author: ahbarnett

CHANGELOG

@@ -5,19 +5,27 @@ V 1.2 (June 2020)
 * a major change to code, internally, and major improvements to operation and
 language interfaces.
 	WARNING: Here are all the interface changes from 1.1.2:
-	- opts is always passed as a pointer in C++/C, not pass-by-reference
-	  as in v1.1.2 or earlier.
+	- opts (nufft_opts) is always passed as a pointer in C++/C, not
+	  pass-by-reference as in v1.1.2 or earlier.
 	- Fortran simple calls are now finufft?d?(..) not finufft?d?_f(..), and
 	  they add a penultimate opts argument.
-	- 
-	These changes were deemed necessary to rationalize and improve FINUFFT.
+	- ier=1 is now a warning not an error; this indicates requested tol
+	  was too small, but that a transform *was* done at the best possible
+	  accuracy.
+	- opts.nthreads was removed in language interfaces. Control of the
+	  number of available OpenMP threads is up to the user.
+	- opts.fftw directly controls the FFTW plan mode consistently in all
+	  language interfaces (this changes the meaning of fftw=0 in MATLAB).
+	These changes were deemed necessary to rationalize and improve FINUFFT
+	for the long term.
 
 ...
 * completely new Fortran interface, allowing >2^31 sized (int64) arrays,
-  all simple, many-vector and guru interface, with options control.
-* all simple and many-vector interfaces call guru interface.
-* new guru interface, by Andrea Malleo and Alex Barnett, allowing easier
-language wrapping and control of point-setting, reuse of sorting and FFTW plans. This finally bypasses the 0.1ms/thread cost of FFTW looking up previous wisdom, which slowed down performance for many small problems.
+  all simple, many-vector and guru interface, with full options control.
+* all simple and many-vector interfaces now call guru interface, for much
+  better maintainability and less code repetition.	
+* new guru interface, by Andrea Malleo and Alex Barnett, allowing easier language wrapping and control of point-setting, reuse of sorting and FFTW plans. This finally bypasses the 0.1ms/thread cost of FFTW looking up previous wisdom, which slowed down performance for many small problems.
+* removed obsolete -DNEED_EXTERN_C flag.
 
 V 1.1.2 (1/31/20)
 

make.inc.GCC7

@@ -1,5 +1,9 @@
-# example override compiler choices in makefile. Here we use GCC 7.
+# example of how to override compiler choices in makefile.
+# Here we use GCC 7 in linux ubuntu 16.40 LTS (provides /usr/bin/g++-7, etc)
+# You should make your own.
 
 CXX=g++-7
 CC=gcc-7
 FC=gfortran-7
+
+CXXFLAGS += -g -Wall

make.inc.linux_ICC

@@ -1,5 +1,5 @@
 # makefile overrides to use Intel ICC compiler & libiomp5. double prec only.
-# fixed the fatal mistake of leaving -lgomp in the compile line, 6/4/20.
+# (fixed the fatal mistake of leaving -lgomp in the compile line! 6/4/20)
 
 CXX=icpc
 CC=icc

make.inc.macosx_clang

@@ -9,7 +9,7 @@
 # (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 = -fPIC -O3
+CFLAGS = -O3
 
 # If you're getting warning messages of the form:
 #    ld: warning: object file (lib-static/libfinufft.a(finufft1d.o)) was built for
@@ -25,7 +25,7 @@ CC=clang
 # taken from makefile...
 CFLAGS   += -I include -I/usr/local/include
 FFLAGS   = $(CFLAGS)
-CXXFLAGS = $(CFLAGS) -DNEED_EXTERN_C
+CXXFLAGS = $(CFLAGS)
 LIBS += -L/usr/local/lib
 
 # OpenMP with clang needs following...
@@ -38,5 +38,5 @@ FFTWOMPSUFFIX=threads
 # some of these will depend on your FFTW library location...
 MFLAGS += -I/usr/local/include -L/usr/local/lib -lm
 # edit for your MATLAB version location...
-MEX = $(shell ls -d /Applications/MATLAB_R201*.app)/bin/mex
+MEX = $(shell ls -d /Applications/MATLAB_R20**.app)/bin/mex
 # Also see docs/install.rst for possible edits to MATLAB's MEX XML file.

make.inc.macosx_gcc-8

@@ -28,7 +28,7 @@ CFLAGS +=
 # as in makefile, but with the brew /usr/local/ stuff...
 CFLAGS   += -I src -I/usr/local/include
 FFLAGS   = $(CFLAGS)
-CXXFLAGS = $(CFLAGS) -DNEED_EXTERN_C
+CXXFLAGS = $(CFLAGS)
 LIBS += -L/usr/local/lib
 
 # OpenMP with GCC on OSX needs following...
@@ -41,5 +41,5 @@ FFTWOMPSUFFIX=threads
 # some of these will depend on your FFTW library location...
 MFLAGS += -I/usr/local/include -L/usr/local/lib -lm
 # edit for your MATLAB version location...
-MEX = $(shell ls -d /Applications/MATLAB_R201*.app)/bin/mex
+MEX = $(shell ls -d /Applications/MATLAB_R20**.app)/bin/mex
 # Also see docs/install.rst for possible edits to MATLAB's MEX XML file.

makefile

@@ -51,11 +51,10 @@ INCL = -Iinclude
 # (Please look in make.inc.* for ideas)
 -include make.inc
 
-# now come flags that should be added, whatever you overrode in make.inc
-# the NEED_EXTERN_C directive tells common.cpp to include plain C header
+# Now come flags that should be added, whatever you overrode in make.inc.
 # -fPIC (position-indep code) needed to build dyn lib (.so)
 # Also, we force return (via :=) to the land of simply-expanded variables...
-CXXFLAGS := $(CXXFLAGS) $(INCL) -fPIC -std=c++14 -DNEED_EXTERN_C
+CXXFLAGS := $(CXXFLAGS) $(INCL) -fPIC -std=c++14
 CFLAGS := $(CFLAGS) $(INCL) -fPIC
 # /usr/include needed for fftw3.f...
 FFLAGS := $(FFLAGS) $(INCL) -I/usr/include -fPIC

src/common.cpp

@@ -10,13 +10,9 @@
 #include <stdlib.h>
 #include <vector>
 
-#ifdef NEED_EXTERN_C
 extern "C" {
   #include "../contrib/legendre_rule_fast.h"
 }
-#else
-  #include "../contrib/legendre_rule_fast.h"
-#endif
 
 void finufft_default_opts(nufft_opts *o)
 // Sets default nufft opts. See finufft.h for definition of opts.