Markus Mottl avatar Markus Mottl committed 5192d9d

Fixes for OCaml 4.01.0 and improved toplevel installation

Comments (0)

Files changed (23)

 OASISFormat:      0.3
 Name:             lacaml
-Version:          7.0.7
+Version:          7.0.8
 Synopsis:         OCaml-bindings to BLAS and LAPACK.
 Description:      This library interfaces the BLAS-library (Basic Linear Algebra Subroutines) and LAPACK-library (Linear Algebra routines), which are written in FORTRAN.
 Authors:          Egbert Ammicht <eammicht@lucent.com>,
 
 Library lacaml_top
   Path:             lib
+  Pack:             true
   FindlibName:      top
   FindlibParent:    lacaml
   Modules:          Install_printers
 # OASIS_START
-# DO NOT EDIT (digest: c2215be9024588d4f03f49098e2051ce)
+# DO NOT EDIT (digest: 77abc98cc3d82b85f6c99d9c8414b7a0)
 # Ignore VCS directories, you can use the same kind of rule outside 
 # OASIS_START/STOP if you want to exclude directories that contains 
 # useless stuff for the build process
 "lib/exp10.c": pkg_bigarray
 # Library lacaml_top
 "lib/lacaml_top.cmxs": use_lacaml_top
+"lib/install_printers.cmx": for-pack(Lacaml_top)
 # Executable blas
 <examples/blas/blas.{native,byte}>: use_lacaml
 <examples/blas/blas.{native,byte}>: pkg_bigarray
 <examples/nag/*.ml{,i}>: pkg_bigarray
 # OASIS_STOP
 
-<**/*.ml{,i}>: warn_A, warn_e, warn_r, annot
+<**/*.ml{,i}>: warn_A, warn_e, warn_r, annot, strict_sequence
 <lib/install_printers.ml>: I(+compiler-libs)
 
-<lib/*.cmx>: for-pack(Lacaml)
+<lib/*.cmx> and not <lib/lacaml_top.cmx>: for-pack(Lacaml)
 <lib/lacaml.cmx>: -for-pack(Lacaml)

examples/eig/eig.ml

 
 open Format
 
-open Lacaml.D
 open Lacaml.Io
 
 let () = Random.self_init ()
 (* SYEV DEMO *)
 
 let () =
+  let open Lacaml.D in
   let n = 5 in
 
   let a = Mat.random ~from:(-500.) ~range:1000. n n in
 (* GEEV DEMO *)
 
 let () =
+  let open Lacaml.D in
   let n = 5 in
 
   let a = Mat.make0 n n in
 
 (* CGEEV DEMO *)
 
-open Lacaml.C
-
 let () =
+  let open Lacaml.C in
   let n = 3 in
 
   let a =

examples/svd/svd.ml

 
 (* REAL GESVD DEMO *)
 
-open Lacaml.D
-
 let () =
+  let open Lacaml.D in
   let n = 3 in
   let a = Mat.hilbert n in
   printf "@[<2>General real matrix A = @[%a@]@]@\n@\n" pp_fmat a;
 
 (* COMPLEX GESVD DEMO *)
 
-open Lacaml.C
-
 let () =
+  let open Lacaml.C in
   let a = Mat.random 3 2 in
   printf "@\n%s@\n@\n" (String.make 80 '-');
   printf "@[<2>General complex matrix A =@\n@\n  @[%a@]@]@\n@\n" pp_cmat a;
 # OASIS_START
-# DO NOT EDIT (digest: 4a8c77efcf57b183cdb798d8b287da99)
-version = "7.0.7"
+# DO NOT EDIT (digest: a5094a62af79a83494ed00d0523e80e8)
+version = "7.0.8"
 description = "OCaml-bindings to BLAS and LAPACK."
 requires = "bigarray"
 archive(byte) = "lacaml.cma"
 archive(native, plugin) = "lacaml.cmxs"
 exists_if = "lacaml.cma"
 package "top" (
- version = "7.0.7"
+ version = "7.0.8"
  description = "Toplevel module for Lacaml."
  requires = "lacaml"
  archive(byte) = "lacaml_top.cma"
 open Printf
 open Bigarray
 open Complex
-open Floatxx
 open Complexxx
 open Common
 open Utils
       ~jobu ~jobvt ~m ~n ~ar ~ac ~a ~s ~ur ~uc ~u ~vtr ~vtc ~vt
       ~work ~lwork ~rwork:RVec.empty
   in
-  if info = 0 then int_of_floatxx work.{1}.re
+  if info = 0 then Floatxx.int_of_floatxx work.{1}.re
   else gesvd_err loc jobu jobvt m n a u vt lwork info
 
 let gesvd_opt_lwork
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *)
 
-open Bigarray
 open Common
 open Complexxx
 
 
 let orgqr_opt_lwork ?m ?n ?k ~tau ?(ar = 1) ?(ac = 1) a =
   let loc = "Lacaml.FPREC.orgqr_opt_lwork" in
-  let m, n, k = orgqr_get_params loc ?m ?n ?k ~tau ?ar ?ac a in
+  let m, n, k = orgqr_get_params loc ?m ?n ?k ~tau ~ar ~ac a in
   orgqr_get_opt_lwork loc ~m ~n ~k ~tau ~ar ~ac ~a
 
 let orgqr ?m ?n ?k ?work ~tau ?(ar = 1) ?(ac = 1) a =
   let loc = "Lacaml.FPREC.orgqr" in
-  let m, n, k = orgqr_get_params loc ?m ?n ?k ~tau ?ar ?ac a in
+  let m, n, k = orgqr_get_params loc ?m ?n ?k ~tau ~ar ~ac a in
   let work, lwork =
     let min_lwork = orgqr_min_lwork ~n in
     let opt_lwork = orgqr_get_opt_lwork loc ~m ~n ~k ~tau ~ar ~ac ~a in
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *)
 
-open Bigarray
 open Common
 open Floatxx
 

lib/impl_SDCZ.mli

 
 (* Interface to BLAS/LAPACK *)
 
-open Bigarray
 open Common
 open Numberxx
 

lib/lacaml_SDCZ.mli

 module Common : sig
   include module type of Common
 end
+open Common
 
 (** Utility functions *)
 module Utils : sig

lib/lacaml_top.mllib

-# OASIS_START
-# DO NOT EDIT (digest: c726c3185ff615847530490542668c8b)
-Install_printers
-# OASIS_STOP

lib/lacaml_top.mlpack

+# OASIS_START
+# DO NOT EDIT (digest: c726c3185ff615847530490542668c8b)
+Install_printers
+# OASIS_STOP
 
 (** {5 Matrix operations} *)
 
-open Bigarray
 open Complexxx
 
 (** {6 Creation of matrices} *)
 
 (** {5 Matrix operations} *)
 
-open Bigarray
 open Floatxx
 
 (** {6 Creation of matrices} *)
 
 (* Matrix operations *)
 
-open Bigarray
 open Common
 open Numberxx
 
 
 (** {5 Vector operations} *)
 
-open Bigarray
 open Complexxx
 
 (** {6 Creation of vectors} *)
 
 (** {5 Vector operations} *)
 
-open Bigarray
 open Floatxx
 
 (** {6 Creation of vectors} *)
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *)
 
-open Bigarray
 open Common
 open Numberxx
 
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *)
 
-let version = "7.0.6"
+let version = "7.0.8"
 let include_re =
   Str.regexp "^\\( *\\)include module type of +\\([A-Za-z0-9_]+_[SDCZ]\\|\
               Io\\|Common\\|[SDCZ]\\|Real_io\\|Complex_io\\)$"
-let open_ba_re = Str.regexp " *open Bigarray *[\n\r\t]?"
+let bad_open_re = Str.regexp " *open \\(Bigarray\\|Common\\) *[\n\r\t]?"
 let prec_re = Str.regexp " *open *\\(Float[0-9]+\\|Complex[0-9]+\\) *[\n\r\t]*"
 
 let rec substitute_mli ?comments ?(prefix="") fname =
       failwith(sprintf "Substituting \"include module type of %s\" in %S but \
                         the file %S does not exist" mname fname fincl) in
   (* "open Bigarray" already present in the main file *)
-  let m = Str.global_replace open_ba_re "" m in
+  let m = Str.global_replace bad_open_re "" m in
   Str.global_replace prec_re "" m
 
 let () =
 let () =
   let additional_rules = function
     | After_rules ->
-        flag ["compile"; "ocaml"] (S [A "-strict-sequence"]);
-
         pflag ["compile"; "ocaml"] "I" (fun x -> S [A "-I"; A x]);
 
         (* Files included, tailored with macros. *)
 (* setup.ml generated for the first time by OASIS v0.2.0 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 5d0a711be15d3a917c7ca6b7690e1f67) *)
+(* DO NOT EDIT (digest: 13df526d445fb7c030c4b29b6cf9104c) *)
 (*
    Regenerated by OASIS v0.3.0
    Visit http://oasis.forge.ocamlcore.org for more information and
           ocaml_version = Some (OASISVersion.VGreaterEqual "3.12");
           findlib_version = Some (OASISVersion.VGreaterEqual "1.3.1");
           name = "lacaml";
-          version = "7.0.7";
+          version = "7.0.8";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
                       },
                    {
                       lib_modules = ["Install_printers"];
-                      lib_pack = false;
+                      lib_pack = true;
                       lib_internal_modules = [];
                       lib_findlib_parent = Some "lacaml";
                       lib_findlib_name = Some "top";
           };
      oasis_fn = Some "_oasis";
      oasis_version = "0.3.0";
-     oasis_digest = Some "\b�y\021�C&:�|�\\�\012\1283";
+     oasis_digest = Some "ڡhַ\138j\158�e\002���j";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false;
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.