Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FFT module revamp + updating dune-lang #680

Merged
merged 13 commits into from
Nov 19, 2024
Merged
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "src/owl/fftpack/pocketfft"]
path = src/owl/fftpack/pocketfft
url = https://github.com/mreineck/pocketfft
2 changes: 1 addition & 1 deletion dune-project
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
(lang dune 2.0)
(lang dune 3.16)

(name owl)
17 changes: 13 additions & 4 deletions examples/dune
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(executables
(names
(names
backprop
checkpoint
cifar10_vgg
Expand All @@ -25,6 +25,15 @@
squeezenet
test_log
tfidf
vgg16
)
(libraries owl))
vgg16)
(libraries owl)
(flags ; in order to make the examples compile correctly even with the warnings.
(:standard
-warn-error
-unused-value-declaration
-warn-error
-unused-var-strict
-warn-error
-unused-var
-warn-error
-unused-field)))
2 changes: 1 addition & 1 deletion src/base/core/owl_graph.ml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ type 'a node =
mutable next : 'a node array
; (* children of the node *)
mutable attr : 'a (* indicate the validity *)
}
} [@@warning "-69"]

type order =
| BFS
Expand Down
17 changes: 13 additions & 4 deletions src/owl/dune
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@

(copy_files# fftpack/*)

(copy_files# fftpack/pocketfft/*.h)

(copy_files# misc/*)

(copy_files# nlp/*)
Expand All @@ -42,6 +44,15 @@
(name owl)
(public_name owl)
(wrapped false)
(foreign_stubs
(language cxx)
(names
;; FFTPACK
owl_fftpack_float32
owl_fftpack_float64)
(flags
:standard
(:include c_flags.sexp)))
(foreign_stubs
(language c)
(names
Expand All @@ -65,9 +76,6 @@
owl_ndarray_utils_stub
owl_slicing_basic_stub
owl_slicing_fancy_stub
;; FFTPACK
owl_fftpack_float32
owl_fftpack_float64
;; stats
SFMT
owl_stats_dist_beta
Expand Down Expand Up @@ -202,7 +210,8 @@
(:include c_flags.sexp)))
(c_library_flags
:standard
(:include c_library_flags.sexp))
(:include c_library_flags.sexp)
-lstdc++)
(flags
:standard
(:include ocaml_flags.sexp))
Expand Down
34 changes: 0 additions & 34 deletions src/owl/fftpack/fftpack.h

This file was deleted.

Loading