Skip to content
Snippets Groups Projects
Commit b9f53954 authored by Julien Girard-Satabin's avatar Julien Girard-Satabin
Browse files

Merge branch 'stable/0.2' into 'master' 

Release 0.2

Closes #35

See merge request laiser/caisar!94
parents 108933bc 5e54f394
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 37 additions and 22 deletions
config/caisar-detection-data.conf
+ 1
− 1
View file @ b9f53954
......@@ -2,7 +2,7 @@
# #
# This file is part of CAISAR. #
# #
# Copyright (C) 2022 #
# Copyright (C) 2023 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
......
config/drivers/abcrown.drv
+ 1
− 1
View file @ b9f53954
......@@ -2,7 +2,7 @@
(* *)
(* This file is part of CAISAR. *)
(* *)
(* Copyright (C) 2022 *)
(* Copyright (C) 2023 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
......
config/drivers/aimos.drv
+ 1
− 1
View file @ b9f53954
......@@ -2,7 +2,7 @@
(* *)
(* This file is part of CAISAR. *)
(* *)
(* Copyright (C) 2022 *)
(* Copyright (C) 2023 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
......
config/drivers/marabou.drv
+ 1
− 1
View file @ b9f53954
......@@ -2,7 +2,7 @@
(* *)
(* This file is part of CAISAR. *)
(* *)
(* Copyright (C) 2022 *)
(* Copyright (C) 2023 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
......
config/drivers/nnenum.drv
+ 1
− 1
View file @ b9f53954
......@@ -2,7 +2,7 @@
(* *)
(* This file is part of CAISAR. *)
(* *)
(* Copyright (C) 2022 *)
(* Copyright (C) 2023 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
......
config/drivers/pyrat.drv
+ 1
− 1
View file @ b9f53954
......@@ -2,7 +2,7 @@
(* *)
(* This file is part of CAISAR. *)
(* *)
(* Copyright (C) 2022 *)
(* Copyright (C) 2023 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
......
config/drivers/pyrat_vnnlib.drv
+ 1
− 1
View file @ b9f53954
......@@ -2,7 +2,7 @@
(* *)
(* This file is part of CAISAR. *)
(* *)
(* Copyright (C) 2022 *)
(* Copyright (C) 2023 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
......
config/drivers/saver.drv
+ 1
− 1
View file @ b9f53954
......@@ -2,7 +2,7 @@
(* *)
(* This file is part of CAISAR. *)
(* *)
(* Copyright (C) 2022 *)
(* Copyright (C) 2023 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
......
config/drivers/vnnlib.gen
+ 1
− 1
View file @ b9f53954
......@@ -2,7 +2,7 @@
(* *)
(* This file is part of CAISAR. *)
(* *)
(* Copyright (C) 2022 *)
(* Copyright (C) 2023 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
......
docker/Dockerfile.template
+ 18
− 3
View file @ b9f53954
......@@ -34,13 +34,28 @@ opam-2.1 update -y
# System dependencies
RUN sudo apt update && \
sudo apt install apt-utils && \
sudo apt install -yy git wget gfortran cmake protobuf-compiler libprotobuf-dev libboost-all-dev libopenblas-dev zip python3-pip zip && \
sudo apt install apt-utils wget && \
sudo apt install -yy git wget gfortran cmake protobuf-compiler libprotobuf-dev libboost-all-dev libopenblas-dev zip && \
sudo apt clean && \
sudo rm -rf /var/lib/apt/lists/
ENV PATH "/home/opam/.local/bin:$PATH"
# Python Conda
ENV SHACONDA "1564571a6a06a9999a75a6c65d63cb82911fc647e96ba5b729f904bf00c177d3"
RUN wget https://repo.anaconda.com/miniconda/Miniconda3-py39_23.3.1-0-Linux-x86_64.sh -O ~/miniconda.sh
RUN SHAFILE=$(sha256sum ~/miniconda.sh | awk '{print $1}') && if [ "$SHAFILE" != "$SHACONDA" ]; then echo "Mismatch between SHA256SUM of downloaded script and expected script, aborting installation."; echo "The expected SHA256SUM is $SHACONDA, but the SHA256SUM of downloaded script is $SHAFILE."; exit 1; fi
RUN /bin/bash ~/miniconda.sh -b && rm ~/miniconda.sh
ENV PATH "/home/opam/miniconda3/bin:$PATH"
RUN conda init bash && conda create -n python_caisar_env python=3.10.9
SHELL ["conda", "run", "-n", "python_caisar_env", "/bin/bash", "-c"]
# External provers
......@@ -53,7 +68,7 @@ RUN pip --default-timeout=1000 install -r pyrat/requirements.txt
ENV PATH "/home/opam/pyrat/:$PATH"
RUN echo "#/usr/bin/sh\n exec /usr/bin/python3 /home/opam/pyrat/pyrat.pyc \"\$@\"" > /home/opam/pyrat/pyrat
RUN echo "#/usr/bin/sh\n exec /home/opam/miniconda3/envs/python_caisar_env/bin/python /home/opam/pyrat/pyrat.pyc \"\$@\"" > /home/opam/pyrat/pyrat
RUN chmod u+x /home/opam/pyrat/pyrat
RUN pyrat -h
......
lib/nnet/nnet.ml
+ 1
− 1
View file @ b9f53954
......@@ -2,7 +2,7 @@
(* *)
(* This file is part of CAISAR. *)
(* *)
(* Copyright (C) 2022 *)
(* Copyright (C) 2023 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
......
lib/nnet/nnet.mli
+ 1
− 1
View file @ b9f53954
......@@ -2,7 +2,7 @@
(* *)
(* This file is part of CAISAR. *)
(* *)
(* Copyright (C) 2022 *)
(* Copyright (C) 2023 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
......
lib/onnx/onnx.ml
+ 1
− 1
View file @ b9f53954
......@@ -2,7 +2,7 @@
(* *)
(* This file is part of CAISAR. *)
(* *)
(* Copyright (C) 2022 *)
(* Copyright (C) 2023 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
......
lib/onnx/onnx.mli
+ 1
− 1
View file @ b9f53954
......@@ -2,7 +2,7 @@
(* *)
(* This file is part of CAISAR. *)
(* *)
(* Copyright (C) 2022 *)
(* Copyright (C) 2023 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
......
lib/ovo/ovo.ml
+ 1
− 1
View file @ b9f53954
......@@ -2,7 +2,7 @@
(* *)
(* This file is part of CAISAR. *)
(* *)
(* Copyright (C) 2022 *)
(* Copyright (C) 2023 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
......
lib/ovo/ovo.mli
+ 1
− 1
View file @ b9f53954
......@@ -2,7 +2,7 @@
(* *)
(* This file is part of CAISAR. *)
(* *)
(* Copyright (C) 2022 *)
(* Copyright (C) 2023 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
......
lib/xgboost/bin/parse_xgboost.ml
+ 1
− 1
View file @ b9f53954
......@@ -2,7 +2,7 @@
(* *)
(* This file is part of CAISAR. *)
(* *)
(* Copyright (C) 2022 *)
(* Copyright (C) 2023 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
......
lib/xgboost/input.ml
+ 1
− 1
View file @ b9f53954
......@@ -2,7 +2,7 @@
(* *)
(* This file is part of CAISAR. *)
(* *)
(* Copyright (C) 2022 *)
(* Copyright (C) 2023 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
......
lib/xgboost/input.mli
+ 1
− 1
View file @ b9f53954
......@@ -2,7 +2,7 @@
(* *)
(* This file is part of CAISAR. *)
(* *)
(* Copyright (C) 2022 *)
(* Copyright (C) 2023 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
......
lib/xgboost/parser.ml
+ 1
− 1
View file @ b9f53954
......@@ -2,7 +2,7 @@
(* *)
(* This file is part of CAISAR. *)
(* *)
(* Copyright (C) 2022 *)
(* Copyright (C) 2023 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment