get rid od utils_precindep

flatironinstitute · Sep 25, 2024 · f83b7d6 · f83b7d6
1 parent 654da01
commit f83b7d6
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 61 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -254,7 +254,7 @@ if(FINUFFT_USE_CPU)
     add_library(
       finufft SHARED
       src/spreadinterp.cpp
-      src/utils_precindep.cpp
+      src/utils.cpp
       contrib/legendre_rule_fast.cpp
       src/fft.cpp
       src/finufft_core.cpp
@@ -264,7 +264,7 @@ if(FINUFFT_USE_CPU)
     add_library(
       finufft STATIC
       src/spreadinterp.cpp
-      src/utils_precindep.cpp
+      src/utils.cpp
       contrib/legendre_rule_fast.cpp
       src/fft.cpp
       src/finufft_core.cpp

diff --git a/include/finufft/test_defs.h b/include/finufft/test_defs.h
@@ -17,7 +17,6 @@
 
 // convenient private finufft internals (must come after finufft.h)
 #include <finufft/utils.h>
-#include <finufft/utils_precindep.h>
 // prec-switching (via SINGLE) to set up FLT, CPX, BIGINT, FINUFFT1D1, etc...
 #include <finufft/defs.h>
 

diff --git a/include/finufft/utils.h b/include/finufft/utils.h
@@ -5,6 +5,9 @@
 #define UTILS_H
 
 #include "finufft/finufft_core.h"
+//  for CNTime...
+//  using chrono since the interface is portable between linux and windows
+#include <chrono>
 
 namespace finufft {
 namespace utils {
@@ -85,7 +88,33 @@ FINUFFT_EXPORT void FINUFFT_CDECL arraywidcen(BIGINT n, T *a, T *w, T *c)
   }
 }
 
+FINUFFT_EXPORT BIGINT FINUFFT_CDECL next235even(BIGINT n);
+
+// jfm's timer class
+class FINUFFT_EXPORT CNTime {
+public:
+  void start();
+  double restart();
+  double elapsedsec();
+
+private:
+  double initial;
+};
+
+// openmp helpers
+int get_num_threads_parallel_block();
+
+} // namespace utils
+} // namespace finufft
+
+// thread-safe rand number generator for Windows platform
+#ifdef _WIN32
+#include <random>
+namespace finufft {
+namespace utils {
+FINUFFT_EXPORT int FINUFFT_CDECL rand_r(unsigned int *seedp);
 } // namespace utils
 } // namespace finufft
+#endif
 
 #endif // UTILS_H
diff --git a/include/finufft/utils_precindep.h b/include/finufft/utils_precindep.h
diff --git a/makefile b/makefile
@@ -134,7 +134,7 @@ STATICLIB = lib-static/$(LIBNAME).a
 ABSDYNLIB = $(FINUFFT)$(DYNLIB)
 
 # spreader dual-precision objs
-SOBJSD = src/utils_precindep.o src/spreadinterp.o
+SOBJSD = src/utils.o src/spreadinterp.o
 
 # precision-independent library object files (compiled & linked only once)...
 OBJS_PI = $(SOBJSD) contrib/legendre_rule_fast.o src/fft.o src/finufft_core.o src/simpleinterfaces.o fortran/finufftfort.o
@@ -261,10 +261,10 @@ test/%: test/%.cpp $(DYNLIB)
 test/%f: test/%.cpp $(DYNLIB)
 	$(CXX) $(CXXFLAGS) ${LDFLAGS} -DSINGLE $< $(ABSDYNLIB) $(LIBSFFT) -o $@
 # low-level tests that are cleaner if depend on only specific objects...
-test/testutils: test/testutils.cpp src/utils_precindep.o
-	$(CXX) $(CXXFLAGS) ${LDFLAGS} test/testutils.cpp src/utils_precindep.o $(LIBS) -o test/testutils
-test/testutilsf: test/testutils.cpp src/utils_precindep.o
-	$(CXX) $(CXXFLAGS) ${LDFLAGS} -DSINGLE test/testutils.cpp src/utils_precindep.o $(LIBS) -o test/testutilsf
+test/testutils: test/testutils.cpp src/utils.o
+	$(CXX) $(CXXFLAGS) ${LDFLAGS} test/testutils.cpp src/utils.o $(LIBS) -o test/testutils
+test/testutilsf: test/testutils.cpp src/utils.o
+	$(CXX) $(CXXFLAGS) ${LDFLAGS} -DSINGLE test/testutils.cpp src/utils.o $(LIBS) -o test/testutilsf
 
 # make sure all double-prec test executables ready for testing
 TESTS := $(basename $(wildcard test/*.cpp))

diff --git a/perftest/manysmallprobs.cpp b/perftest/manysmallprobs.cpp
@@ -3,7 +3,7 @@
 #include "finufft/defs.h"
 
 // private access to timer
-#include "finufft/utils_precindep.h"
+#include "finufft/utils.h"
 using namespace finufft::utils;
 
 #include <complex>

diff --git a/perftest/spreadtestnd.cpp b/perftest/spreadtestnd.cpp
@@ -1,7 +1,6 @@
 #include <finufft/defs.h>
 #include <finufft/spreadinterp.h>
 #include <finufft/utils.h>
-#include <finufft/utils_precindep.h>
 
 #include <math.h>
 #include <stdio.h>

diff --git a/perftest/spreadtestndall.cpp b/perftest/spreadtestndall.cpp
@@ -1,6 +1,6 @@
 #include <finufft/defs.h>
 #include <finufft/spreadinterp.h>
-#include <finufft/utils_precindep.h>
+#include <finufft/utils.h>
 
 #include <cmath>
 #include <cstdio>

diff --git a/src/finufft_core.cpp b/src/finufft_core.cpp
@@ -2,7 +2,6 @@
 #include <finufft/finufft_core.h>
 #include <finufft/spreadinterp.h>
 #include <finufft/utils.h>
-#include <finufft/utils_precindep.h>
 
 #include "../contrib/legendre_rule_fast.h"
 #include <cmath>

diff --git a/src/spreadinterp.cpp b/src/spreadinterp.cpp
@@ -3,7 +3,6 @@
 #include <finufft/defs.h>
 #include <finufft/spreadinterp.h>
 #include <finufft/utils.h>
-#include <finufft/utils_precindep.h>
 
 #include "ker_horner_allw_loop_constexpr.h"
 #include "ker_lowupsampfac_horner_allw_loop_constexpr.h"

diff --git a/src/utils_precindep.cpp → src/utils.cpp b/src/utils_precindep.cpp → src/utils.cpp
@@ -5,7 +5,7 @@
 
 #include <cstdint>
 
-#include "finufft/utils_precindep.h"
+#include "finufft/utils.h"
 using namespace std;
 
 namespace finufft {

diff --git a/test/testutils.cpp b/test/testutils.cpp
@@ -1,4 +1,4 @@
-/* unit tests for utils & utils_precindep modules.
+/* unit tests for utils module.
 
    Usage: ./testutils{f}
 
@@ -10,8 +10,8 @@
 
    Suggested compile (double/float versions):
    g++ -std=c++14 -fopenmp testutils.cpp -I../include ../src/utils.o
-   ../src/utils_precindep.o -o testutils -lgomp g++ -std=c++14 -fopenmp testutils.cpp
-   -I../include ../src/utils_32.o ../src/utils_precindep.o -o testutilsf -lgomp -DSINGLE
+   ../src/utils.o -o testutils -lgomp g++ -std=c++14 -fopenmp testutils.cpp
+   -I../include ../src/utils.o -o testutilsf -lgomp -DSINGLE
 */
 
 // This switches FLT macro from double to float if SINGLE is defined, etc...