From d1042763f0b5a3f73e58a2aaf56af942c1cdf133 Mon Sep 17 00:00:00 2001 From: Michele Alberti <michele.alberti@cea.fr> Date: Wed, 13 Jul 2022 11:23:32 +0200 Subject: [PATCH] [dune] Pass of dune fmt. --- config/dune | 16 +++++++++------- lib/nnet/dune | 9 ++++----- lib/onnx/dune | 17 ++++++++--------- lib/ovo/dune | 9 ++++----- src/dune | 37 +++++++++++++++++++++++++++++-------- stdlib/dune | 6 ++++-- tests/dune | 18 ++++++++---------- 7 files changed, 66 insertions(+), 46 deletions(-) diff --git a/config/dune b/config/dune index fd50a8bc..4398e3dc 100644 --- a/config/dune +++ b/config/dune @@ -1,8 +1,10 @@ (install - (section (site (caisar config))) - (files caisar-detection-data.conf - (drivers/pyrat.drv as drivers/pyrat.drv) - (drivers/marabou.drv as drivers/marabou.drv) - (drivers/saver.drv as drivers/saver.drv) - ) -(package caisar)) + (section + (site + (caisar config))) + (files + caisar-detection-data.conf + (drivers/pyrat.drv as drivers/pyrat.drv) + (drivers/marabou.drv as drivers/marabou.drv) + (drivers/saver.drv as drivers/saver.drv)) + (package caisar)) diff --git a/lib/nnet/dune b/lib/nnet/dune index 78df3604..6674a9ec 100644 --- a/lib/nnet/dune +++ b/lib/nnet/dune @@ -1,6 +1,5 @@ (library - (name nnet) - (public_name caisar-nnet) - (libraries base csv) - (synopsis "NNet parser for CAISAR") -) + (name nnet) + (public_name caisar-nnet) + (libraries base csv) + (synopsis "NNet parser for CAISAR")) diff --git a/lib/onnx/dune b/lib/onnx/dune index 707eb2dd..1008baf4 100644 --- a/lib/onnx/dune +++ b/lib/onnx/dune @@ -1,12 +1,11 @@ (library - (name onnx) - (public_name caisar-onnx) - (libraries base stdio ocaml-protoc-plugin) - (synopsis "ONNX parser for CAISAR") -) + (name onnx) + (public_name caisar-onnx) + (libraries base stdio ocaml-protoc-plugin) + (synopsis "ONNX parser for CAISAR")) (rule - (deps onnx_protoc.proto generate_onnx_interface.sh) - (targets onnx_protoc.ml) - (action (run ./generate_onnx_interface.sh)) -) + (deps onnx_protoc.proto generate_onnx_interface.sh) + (targets onnx_protoc.ml) + (action + (run ./generate_onnx_interface.sh))) diff --git a/lib/ovo/dune b/lib/ovo/dune index 919b62e4..65525220 100644 --- a/lib/ovo/dune +++ b/lib/ovo/dune @@ -1,6 +1,5 @@ (library - (name ovo) - (public_name caisar-ovo) - (libraries base csv) - (synopsis "OVO parser for CAISAR") -) + (name ovo) + (public_name caisar-ovo) + (libraries base csv) + (synopsis "OVO parser for CAISAR")) diff --git a/src/dune b/src/dune index 2a6a2474..16397dcc 100644 --- a/src/dune +++ b/src/dune @@ -1,13 +1,34 @@ (executable - (name main) - (public_name caisar) - (libraries menhirLib yojson cmdliner logs logs.cli logs.fmt fmt.tty base unix str ppx_deriving_yojson.runtime nnet onnx ovo why3 dune-site re) - (preprocess (pps ppx_deriving_yojson ppx_deriving.show ppx_deriving.ord ppx_deriving.eq)) - (package caisar) -) + (name main) + (public_name caisar) + (libraries + menhirLib + yojson + cmdliner + logs + logs.cli + logs.fmt + fmt.tty + base + unix + str + ppx_deriving_yojson.runtime + nnet + onnx + ovo + why3 + dune-site + re) + (preprocess + (pps + ppx_deriving_yojson + ppx_deriving.show + ppx_deriving.ord + ppx_deriving.eq)) + (package caisar)) (include_subdirs unqualified) (generate_sites_module - (module dirs) - (sites caisar)) + (module dirs) + (sites caisar)) diff --git a/stdlib/dune b/stdlib/dune index ddb41974..f1d9fa74 100644 --- a/stdlib/dune +++ b/stdlib/dune @@ -1,4 +1,6 @@ (install - (section (site (caisar stdlib))) + (section + (site + (caisar stdlib))) (files caisar.mlw) -(package caisar)) + (package caisar)) diff --git a/tests/dune b/tests/dune index a99e393b..9e2e5eaf 100644 --- a/tests/dune +++ b/tests/dune @@ -1,12 +1,10 @@ (cram - (deps - (package caisar) - TestNetwork.nnet - TestNetworkONNX.onnx - TestSVM.ovo - bin/pyrat.py - bin/Marabou - bin/saver - ) + (deps (package caisar) -) + TestNetwork.nnet + TestNetworkONNX.onnx + TestSVM.ovo + bin/pyrat.py + bin/Marabou + bin/saver) + (package caisar)) -- GitLab