From f085be6fe8633452a04dd1aec571dbd3a1129d27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Bobot?= <francois.bobot@cea.fr> Date: Fri, 23 Jun 2023 11:25:18 +0200 Subject: [PATCH] [xgboost] specify that xgboost tests are for caisar-xgboost package only --- caisar-ir.opam | 1 - caisar-nnet.opam | 1 - caisar-ovo.opam | 1 - dune-project | 3 --- lib/xgboost/bin/dune | 3 ++- lib/xgboost/example/dune | 6 ++++-- src/dune | 2 +- 7 files changed, 7 insertions(+), 10 deletions(-) diff --git a/caisar-ir.opam b/caisar-ir.opam index 8502eb3..1fc076f 100644 --- a/caisar-ir.opam +++ b/caisar-ir.opam @@ -17,7 +17,6 @@ depends: [ "ocamlgraph" {>= "1.8.8"} "ppx_inline_test" {>= "0.12.0"} "ppx_deriving" {>= "4.4.1"} - "caisar-xgboost" {= version & = with-test} "odoc" {with-doc} ] build: [ diff --git a/caisar-nnet.opam b/caisar-nnet.opam index 897fc06..bdbceb3 100644 --- a/caisar-nnet.opam +++ b/caisar-nnet.opam @@ -15,7 +15,6 @@ depends: [ "ocaml" {>= "4.13"} "base" {>= "v0.14.0"} "csv" {>= "2.4"} - "caisar-xgboost" {= version & = with-test} "odoc" {with-doc} ] build: [ diff --git a/caisar-ovo.opam b/caisar-ovo.opam index 985346a..3ed5ce4 100644 --- a/caisar-ovo.opam +++ b/caisar-ovo.opam @@ -15,7 +15,6 @@ depends: [ "ocaml" {>= "4.13"} "base" {>= "v0.14.0"} "csv" {>= "2.4"} - "caisar-xgboost" {= version & = with-test} "odoc" {with-doc} ] build: [ diff --git a/dune-project b/dune-project index 35fabf4..6555095 100644 --- a/dune-project +++ b/dune-project @@ -24,7 +24,6 @@ (ocaml (>= 4.13)) (base (>= v0.14.0)) (csv (>= 2.4)) - (caisar-xgboost (and (= :version ) (= :with-test))) ) ) @@ -35,7 +34,6 @@ (ocaml (>= 4.13)) (base (>= v0.14.0)) (csv (>= 2.4)) - (caisar-xgboost (and (= :version ) (= :with-test))) ) ) @@ -74,7 +72,6 @@ (ocamlgraph (>= 1.8.8)) (ppx_inline_test (>= 0.12.0)) (ppx_deriving (>= 4.4.1)) - (caisar-xgboost (and (= :version ) (= :with-test))) ) ) diff --git a/lib/xgboost/bin/dune b/lib/xgboost/bin/dune index d18e2e5..cef6813 100644 --- a/lib/xgboost/bin/dune +++ b/lib/xgboost/bin/dune @@ -1,3 +1,4 @@ (executable (name parse_xgboost) - (libraries yojson caisar_xgboost csv)) + (libraries yojson caisar-xgboost csv) +) diff --git a/lib/xgboost/example/dune b/lib/xgboost/example/dune index 9f7a526..7c04873 100644 --- a/lib/xgboost/example/dune +++ b/lib/xgboost/example/dune @@ -1,7 +1,9 @@ (cram (deps model-0.json agaricus.test.svm ../bin/parse_xgboost.exe) - (applies_to logistic)) + (applies_to logistic) + (package caisar-xgboost)) (cram (deps california.json california.csv ../bin/parse_xgboost.exe) - (applies_to california)) + (applies_to california) + (package caisar-xgboost)) diff --git a/src/dune b/src/dune index 06a53eb..38b0ce7 100644 --- a/src/dune +++ b/src/dune @@ -24,7 +24,7 @@ yaml.unix fpath zarith - caisar_xgboost) + caisar-xgboost) (preprocess (pps ppx_deriving_yojson -- GitLab