From 14b51ac38a76bb8c553b9850a65ed841a0c8648e Mon Sep 17 00:00:00 2001
From: Julien Girard <julien.girard2@cea.fr>
Date: Mon, 13 May 2024 17:30:08 +0200
Subject: [PATCH] [chore] Moved logging to a proper library
---
flake.nix | 1 +
lib/ir/dune | 2 +-
lib/nnet/dune | 2 +-
lib/onnx/dune | 2 +-
lib/ovo/dune | 2 +-
lib/xgboost/dune | 2 +-
logging/dune | 5 +++++
{src => logging}/logging.ml | 0
{src => logging}/logging.mli | 0
src/dune | 4 +---
10 files changed, 12 insertions(+), 8 deletions(-)
create mode 100644 logging/dune
rename {src => logging}/logging.ml (100%)
rename {src => logging}/logging.mli (100%)
diff --git a/flake.nix b/flake.nix
index 94fb118..73f1d55 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,6 +30,7 @@
(nix-filter.lib.inDirectory "config")
(nix-filter.lib.inDirectory "stdlib")
(nix-filter.lib.inDirectory "doc")
+ (nix-filter.lib.inDirectory "logging")
];
};
};
diff --git a/lib/ir/dune b/lib/ir/dune
index a0fa355..fa1ef79 100644
--- a/lib/ir/dune
+++ b/lib/ir/dune
@@ -11,7 +11,7 @@
ppx_deriving.iter
ppx_deriving.fold))
(inline_tests)
- (libraries base ocamlgraph fmt stdio))
+ (libraries base ocamlgraph fmt stdio caisar.log))
(env
(dev
diff --git a/lib/nnet/dune b/lib/nnet/dune
index 052c7e9..e8f9ce3 100644
--- a/lib/nnet/dune
+++ b/lib/nnet/dune
@@ -1,5 +1,5 @@
(library
(name nnet)
(public_name caisar.nnet)
- (libraries base csv)
+ (libraries base csv caisar.log)
(synopsis "NNet parser for CAISAR"))
diff --git a/lib/onnx/dune b/lib/onnx/dune
index 88dea6f..1ada251 100644
--- a/lib/onnx/dune
+++ b/lib/onnx/dune
@@ -1,7 +1,7 @@
(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.log)
(synopsis "ONNX parser for CAISAR"))
(rule
diff --git a/lib/ovo/dune b/lib/ovo/dune
index e54243a..e6853d5 100644
--- a/lib/ovo/dune
+++ b/lib/ovo/dune
@@ -1,5 +1,5 @@
(library
(name ovo)
(public_name caisar.ovo)
- (libraries base csv)
+ (libraries base csv caisar.log)
(synopsis "OVO parser for CAISAR"))
diff --git a/lib/xgboost/dune b/lib/xgboost/dune
index 9a07b01..1bb408b 100644
--- a/lib/xgboost/dune
+++ b/lib/xgboost/dune
@@ -4,4 +4,4 @@
(preprocess
(pps ppx_deriving.show ppx_deriving_yojson))
(flags -w -30)
- (libraries csv))
+ (libraries csv caisar.log))
diff --git a/logging/dune b/logging/dune
new file mode 100644
index 0000000..1bd4188
--- /dev/null
+++ b/logging/dune
@@ -0,0 +1,5 @@
+(library
+ (name logging)
+ (public_name caisar.log)
+ (libraries base csv logs logs.cli logs.fmt fmt why3)
+ (synopsis "Logging utilities for CAISAR"))
diff --git a/src/logging.ml b/logging/logging.ml
similarity index 100%
rename from src/logging.ml
rename to logging/logging.ml
diff --git a/src/logging.mli b/logging/logging.mli
similarity index 100%
rename from src/logging.mli
rename to logging/logging.mli
diff --git a/src/dune b/src/dune
index 013aad1..bba4095 100644
--- a/src/dune
+++ b/src/dune
@@ -5,9 +5,6 @@
menhirLib
yojson
cmdliner
- logs
- logs.cli
- logs.fmt
fmt.tty
fmt.cli
base
@@ -24,6 +21,7 @@
yaml.unix
fpath
zarith
+ caisar.log
caisar.xgboost)
(preprocess
(pps
--
GitLab