Merge remote-tracking branch 'origin/master' into feature/bobot/mk_onnx

flake.nix

@@ -31,6 +31,7 @@
             (nix-filter.lib.inDirectory "config")
             (nix-filter.lib.inDirectory "stdlib")
             (nix-filter.lib.inDirectory "doc")
+            (nix-filter.lib.inDirectory "utils")
           ];
         };
       };

lib/ir/dune

@@ -11,7 +11,7 @@
    ppx_deriving.iter
    ppx_deriving.fold))
  (inline_tests)
- (libraries base ocamlgraph fmt stdio unix))
+ (libraries base ocamlgraph fmt stdio unix caisar_logging))
 
 (env
  (dev

lib/nnet/dune

 (library
  (name nnet)
  (public_name caisar.nnet)
- (libraries base csv)
+ (libraries base csv caisar_logging)
  (synopsis "NNet parser for CAISAR"))

lib/onnx/dune

 (library
  (name onnx)
  (public_name caisar.onnx)
- (libraries base stdio ocaml-protoc-plugin ocplib-endian caisar.ir)
+ (libraries base stdio ocaml-protoc-plugin ocplib-endian caisar.ir caisar_logging)
  (synopsis "ONNX parser for CAISAR"))
 
 (rule

lib/ovo/dune

 (library
  (name ovo)
  (public_name caisar.ovo)
- (libraries base csv)
+ (libraries base csv caisar_logging)
  (synopsis "OVO parser for CAISAR"))

lib/xgboost/dune

@@ -4,4 +4,4 @@
  (preprocess
   (pps ppx_deriving.show ppx_deriving_yojson))
  (flags -w -30)
- (libraries csv))
+ (libraries csv caisar_logging))

src/dune

 (executable
  (name main)
  (public_name caisar)
+ (flags
+  (:standard -open Caisar_logging))
  (libraries
   menhirLib
   yojson
   cmdliner
-  logs
-  logs.cli
-  logs.fmt
   fmt.tty
   fmt.cli
   base
@@ -24,6 +23,7 @@
   yaml.unix
   fpath
   zarith
+  caisar_logging
   caisar.xgboost)
  (preprocess
   (pps

utils/dune

+(library
+ (name caisar_logging)
+ (package caisar)
+ (libraries base csv logs logs.cli logs.fmt fmt why3)
+ (synopsis "Logging utilities for CAISAR"))