Skip to content

Commit 41752c5

Browse files
committed
Ubuntu 4.x build fix. MacOS fix attempt.
1 parent 5e45f71 commit 41752c5

File tree

4 files changed

+25
-0
lines changed

4 files changed

+25
-0
lines changed

src/owl/dune

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
owl_fftpack_float64)
5353
(flags
5454
:standard
55+
-std=c++11
5556
(:include c_flags.sexp)))
5657
(foreign_stubs
5758
(language c)

src/owl/fftpack/owl_fftpack_float32.cc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@
1010
extern "C"
1111
{
1212
#include "owl_core.h"
13+
value float32_cfft(value vForward, value vX, value vY, value vD, value vNorm, value vNthreads);
14+
value float32_cfft_bytecode(value *argv, int argn);
15+
value float32_rfftf(value vX, value vY, value vD, value vNorm, value vNthreads);
16+
value float32_rfftb(value vX, value vY, value vD, value vNorm, value vNthreads);
17+
value float32_dct(value vX, value vY, value vD, value vType, value vNorm, value vOrtho, value vNthreads);
18+
value float32_dct_bytecode(value *argv, int argn);
19+
value float32_dst(value vX, value vY, value vD, value vType, value vNorm, value vOrtho, value vNthreads);
20+
value float32_dst_bytecode(value *argv, int argn);
1321
}
1422

1523
#define REAL_COPY owl_float32_copy

src/owl/fftpack/owl_fftpack_float64.cc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@
99
extern "C"
1010
{
1111
#include "owl_core.h"
12+
value float64_cfft(value vForward, value vX, value vY, value vD, value vNorm, value vNthreads);
13+
value float64_cfft_bytecode(value *argv, int argn);
14+
value float64_rfftf(value vX, value vY, value vD, value vNorm, value vNthreads);
15+
value float64_rfftb(value vX, value vY, value vD, value vNorm, value vNthreads);
16+
value float64_dct(value vX, value vY, value vD, value vType, value vNorm, value vOrtho, value vNthreads);
17+
value float64_dct_bytecode(value *argv, int argn);
18+
value float64_dst(value vX, value vY, value vD, value vType, value vNorm, value vOrtho, value vNthreads);
19+
value float64_dst_bytecode(value *argv, int argn);
1220
}
1321

1422
#define REAL_COPY owl_float64_copy

src/owl/fftpack/owl_fftpack_impl.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,16 @@
55

66
#ifdef Treal
77

8+
#ifdef CAML_COMPATIBILITY_H
9+
#undef invalid_argument /* For version < 5.0 of the OCaml compiler, allowing std::invalid_argument to be used */
10+
#endif
11+
812
#include "pocketfft_hdronly.h"
913

14+
#ifdef CAML_COMPATIBILITY_H
15+
#define invalid_argument caml_invalid_argument
16+
#endif
17+
1018
/** Owl's interface function to pocketfft **/
1119
/** Adapted from scipy's pypocketfft.cxx **/
1220

0 commit comments

Comments
 (0)