Merge branch 'fix/michele/better-wrapper-38' into 'master'

Better python script for faking --version option.

Closes #38

See merge request laiser/caisar!89

bin/abcrown.sh

@@ -23,7 +23,7 @@
 
 if [ "$1" = "--version" ]; then
     SCRIPT_DIR=$( dirname -- "$0"; )
-    $SCRIPT_DIR/findmodule.py "complete_verifier.abcrown" "dummy-version"
+    $SCRIPT_DIR/dummyversion.py "complete_verifier.abcrown"
 else
-    python3 -m complete_verifier.abcrown "$@"
+    OMP_NUM_THREADS=1 python3 -m complete_verifier.abcrown "$@"
 fi

bin/findmodule.py → bin/dummyversion.py

@@ -23,14 +23,23 @@
 
 import sys
 import importlib
+from importlib import import_module
 
 module_name = str(sys.argv[1])
-output = str(sys.argv[2])
 
 spec = importlib.util.find_spec(module_name)
 
-if spec is not None:
-  print(output)
-  exit(0)
-else:
-  exit(1)
+if spec is None:
+    # [module_name] cannot be found: most likely, the PYTHONPATH has not been
+    # correctly set up.
+    exit(1)
+
+# [module_name] has been found. However, this is not sufficient to conclude that
+# its interpretation/execution will not fail, e.g., due to unmet dependencies.
+try:
+    import_module(module_name)
+except ModuleNotFoundError:
+    exit(1)
+
+print("dummy-version")
+exit(0)

bin/dune

@@ -2,6 +2,6 @@
  (package caisar)
  (section bin)
  (files
-  (findmodule.py as findmodule.py)
+  (dummyversion.py as dummyversion.py)
   (nnenum.sh as nnenum.sh)
   (abcrown.sh as abcrown.sh)))

bin/nnenum.sh

@@ -23,7 +23,7 @@
 
 if [ "$1" = "--version" ]; then
     SCRIPT_DIR=$( dirname -- "$0"; )
-    $SCRIPT_DIR/findmodule.py "nnenum" "dummy-version"
+    $SCRIPT_DIR/dummyversion.py "nnenum.nnenum"
 else
     OMP_NUM_THREADS=1 OPENBLAS_NUM_THREADS=1 python3 -m nnenum.nnenum "$@"
 fi

config/caisar-detection-data.conf

@@ -108,7 +108,7 @@ command = "%e --device cpu --onnx_path %{nnet-onnx} --vnnlib_path %f --timeout %
 driver = "%{config}/drivers/abcrown.drv"
 use_at_auto_level = 1
 
-[ATP abcrown]
+[ATP abcrown-acas]
 name = "alpha-beta-CROWN"
 alternative = "ACAS"
 exec = "abcrown.sh"