Merge pull request #21 from nandor/master

upgraded to dune 2.0, fixed cross-compilation

Makefile

@@ -1,6 +1,5 @@
 PHONY: build
 build:
-	dune build -p eigen eigen_cpp/libeigen_cpp_stubs.a
 	dune build -p eigen
 
 PHONY: install

dune-project

@@ -1,2 +1,2 @@
-(lang dune 1.5)
+(lang dune 2.0)
 (name eigen)

eigen.opam

@@ -7,13 +7,12 @@ dev-repo: "git+https://github.com/owlbarn/eigen.git"
 bug-reports: "https://github.com/owlbarn/eigen/issues"
 doc: "https://owlbarn.github.io/eigen/eigen"
 build: [
-  ["dune" "build" "-p" name "eigen_cpp/libeigen_cpp_stubs.a"]
   ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
   "ocaml" {>= "4.02"}
   "ctypes" {>= "0.14.0"}
-  "dune" {>= "1.5.0"}
+  "dune" {>= "2.0.0"}
 ]
 synopsis: "Owl's OCaml interface to Eigen3 C++ library"
 description:

eigen/dune

@@ -33,8 +33,11 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
  (public_name eigen)
  (libraries ctypes eigen.cpp)
  (modules :standard ffi_eigen_generated)
- (c_names eigen_utils_stubs ffi_eigen_generated_stub)
- (c_flags :standard %s -I../eigen_cpp/lib) ;-flto
+ (foreign_stubs
+  (language c)
+  (names eigen_utils_stubs ffi_eigen_generated_stub)
+  (flags :standard %s -I../eigen_cpp/lib)
+  )
  (c_library_flags :standard -lstdc++)
 )
 |} eigen_flags

eigen_cpp/dune

@@ -1,23 +1,39 @@
-(rule
- (targets libeigen_cpp_stubs.a dlleigen_cpp_stubs.so)
- (deps lib/libeigen.a lib/libeigen.so)
- (action
-  (progn
-    (bash "cp lib/libeigen.a libeigen.a")
-    (bash "ar -x libeigen.a")
-    (bash "ocamlmklib.opt -g -o eigen_cpp_stubs *.o -lstdc++")
-    )
-  )
- )
+(* -*- tuareg -*- *)
+
+let optflags =
+  match Sys.getenv "EIGENCPP_OPTFLAGS" with
+  | s ->
+    s
+  | exception Not_found ->
+    "-Ofast -march=native -mfpmath=sse -funroll-loops -ffast-math"
+
+let () = Printf.ksprintf Jbuild_plugin.V1.send {|
+
+(include_subdirs unqualified)
 
 (library
- (name eigen_cpp)
+ (name eigen_cpp_stubs)
  (public_name eigen.cpp)
  (libraries ctypes)
- (c_library_flags
-  (:standard -lstdc++)
-  )
- (self_build_stubs_archive
-  (eigen_cpp)
+ (foreign_stubs
+  (language cxx)
+  (names eigen_tensor eigen_dsmat eigen_spmat)
+  (include_dirs lib lib/unsupported)
+  (flags
+    :standard
+    -fPIC
+    -ansi
+    -O3
+    -std=c++11
+    -pedantic
+    -Wall
+    -Wno-invalid-partial-specialization
+    -Wno-extern-c-compat
+    -Wno-c++11-long-long
+    %s
+   )
   )
+ (c_library_flags :standard -lstdc++)
  )
+
+|} optflags

eigen_cpp/lib/Eigen/src/Core/util/Meta.h

@@ -16,11 +16,15 @@
 #include <math_constants.h>
 #endif
 
+// This is a hack to avoid redefining the macro with a different value.
+// Meta.h and Macros.h do not agree on the definition of C++11.
+#ifndef EIGEN_HAS_CXX11
 #if EIGEN_COMP_ICC>=1600 &&  __cplusplus >= 201103L
 #define EIGEN_HAS_CXX11 1
 #else
 #define EIGEN_HAS_CXX11 0
 #endif
+#endif
 
 // Define portable (u)int{32,64} types
 #if EIGEN_HAS_CXX11
@@ -492,7 +496,7 @@ template<typename T, typename U> struct scalar_product_traits
 } // end namespace internal
 
 namespace numext {
-  
+
 #if defined(__CUDA_ARCH__)
 template<typename T> EIGEN_DEVICE_FUNC   void swap(T &a, T &b) { T tmp = b; b = a; a = tmp; }
 #else