Ubuntu 4.x build fix. MacOS fix attempt.

owlbarn · Nov 18, 2024 · 41752c5 · 41752c5
1 parent 5e45f71
commit 41752c5
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 0 deletions.
diff --git a/src/owl/dune b/src/owl/dune
@@ -52,6 +52,7 @@
    owl_fftpack_float64)
   (flags
    :standard
+   -std=c++11
    (:include c_flags.sexp)))
  (foreign_stubs
   (language c)

diff --git a/src/owl/fftpack/owl_fftpack_float32.cc b/src/owl/fftpack/owl_fftpack_float32.cc
@@ -10,6 +10,14 @@
 extern "C"
 {
 #include "owl_core.h"
+    value float32_cfft(value vForward, value vX, value vY, value vD, value vNorm, value vNthreads);
+    value float32_cfft_bytecode(value *argv, int argn);
+    value float32_rfftf(value vX, value vY, value vD, value vNorm, value vNthreads);
+    value float32_rfftb(value vX, value vY, value vD, value vNorm, value vNthreads);
+    value float32_dct(value vX, value vY, value vD, value vType, value vNorm, value vOrtho, value vNthreads);
+    value float32_dct_bytecode(value *argv, int argn);
+    value float32_dst(value vX, value vY, value vD, value vType, value vNorm, value vOrtho, value vNthreads);
+    value float32_dst_bytecode(value *argv, int argn);
 }
 
 #define REAL_COPY owl_float32_copy

diff --git a/src/owl/fftpack/owl_fftpack_float64.cc b/src/owl/fftpack/owl_fftpack_float64.cc
@@ -9,6 +9,14 @@
 extern "C"
 {
 #include "owl_core.h"
+    value float64_cfft(value vForward, value vX, value vY, value vD, value vNorm, value vNthreads);
+    value float64_cfft_bytecode(value *argv, int argn);
+    value float64_rfftf(value vX, value vY, value vD, value vNorm, value vNthreads);
+    value float64_rfftb(value vX, value vY, value vD, value vNorm, value vNthreads);
+    value float64_dct(value vX, value vY, value vD, value vType, value vNorm, value vOrtho, value vNthreads);
+    value float64_dct_bytecode(value *argv, int argn);
+    value float64_dst(value vX, value vY, value vD, value vType, value vNorm, value vOrtho, value vNthreads);
+    value float64_dst_bytecode(value *argv, int argn);
 }
 
 #define REAL_COPY owl_float64_copy

diff --git a/src/owl/fftpack/owl_fftpack_impl.h b/src/owl/fftpack/owl_fftpack_impl.h
@@ -5,8 +5,16 @@
 
 #ifdef Treal
 
+#ifdef CAML_COMPATIBILITY_H
+#undef invalid_argument /* For version < 5.0 of the OCaml compiler, allowing std::invalid_argument to be used */
+#endif
+
 #include "pocketfft_hdronly.h"
 
+#ifdef CAML_COMPATIBILITY_H
+#define invalid_argument caml_invalid_argument
+#endif
+
 /** Owl's interface function to pocketfft **/
 /** Adapted from scipy's pypocketfft.cxx **/