diff --git a/docker/Dockerfile.template b/docker/Dockerfile.template index 1fffcefc8befb6002d86ee34176e20da5771660b..c19e786ec8bc26ee47f6da5e9fe8133476c5ac45 100644 --- a/docker/Dockerfile.template +++ b/docker/Dockerfile.template @@ -87,7 +87,6 @@ make install ENV PATH "/home/opam/saver/bin:$PATH" - ## NNenum RUN git clone https://github.com/stanleybak/nnenum.git && \ @@ -107,13 +106,13 @@ git -C alpha-beta-CROWN checkout 7b3d507caf40a5f42d99f6894373526c6fd615b7 # https://github.com/Verified-Intelligence/alpha-beta-CROWN/blob/main/vnncomp_scripts/install_tool_general.sh, # and removing dependencies that are already in PyRAT # dependency set: pytorch, torchvision, torchaudio, tqdm, -# pandas, protobuf +# pandas, protobuf, onnx, onnxruntime # DNNV and onnx2pytorch set on a specific commit # WARNING: Result in Pillow version and networkx version # different than what is expected by PyRAT and/or nnenum! RUN cd alpha-beta-CROWN && \ -/usr/bin/python3.10 -m pip install --no-input --no-cache-dir onnx onnxruntime git+https://github.com/KaidiXu/onnx2pytorch.git@fe7281b9b6c8c28f61e72b8f3b0e3181067c7399 git+https://github.com/dlshriver/DNNV.git@6ab81fff8b83e5e7d5d964e409d092190368c8f1 pyyaml packaging appdirs sortedcontainers mkl==2019.0 pyyaml appdirs +/usr/bin/python3.10 -m pip install --no-input --no-cache-dir git+https://github.com/KaidiXu/onnx2pytorch.git@fe7281b9b6c8c28f61e72b8f3b0e3181067c7399 git+https://github.com/dlshriver/DNNV.git@6ab81fff8b83e5e7d5d964e409d092190368c8f1 pyyaml packaging appdirs sortedcontainers mkl==2019.0 pyyaml appdirs ENV PYTHONPATH "$PYTHONPATH:/home/opam/alpha-beta-CROWN/complete_verifier" diff --git a/docker/Makefile b/docker/Makefile index ad671f21caf939d146222d4ab9e2ce780f7dcdc2..900ed3f12520f797d82af2b493ee898942f4ad3d 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -35,7 +35,7 @@ push: all docker push laiser/caisar:pub SHA_DOCKER=$(shell docker manifest inspect ocaml/opam:ubuntu-$(UBUNTU_VERSION)-ocaml-$(OCAML_VERSION) | jq '.manifests| .[] | select(.platform.architecture == "amd64") | .digest' --raw-output) -SHA_DOCKER:=$(or $(SHA_DOCKER),sha256:9d471148a7acdaba15caa139710f89ca8668a191c0052eb1c80cb9729e337c40) +SHA_DOCKER:=$(or $(SHA_DOCKER),sha256:e6529eedeeab653b03eae55b91a9491bc45be4717197d2f94a6615db939cfae6) CAISAR_COMMIT?=$(shell git rev-parse HEAD)