diff --git a/examples/mnist/nets/dummy_nn/FNN_s42_012.onnx b/examples/mnist/nets/dummy_nn/FNN_s42_012.onnx deleted file mode 100644 index 8328c4fa41467b103a90a4b93284e1922d68843d..0000000000000000000000000000000000000000 Binary files a/examples/mnist/nets/dummy_nn/FNN_s42_012.onnx and /dev/null differ diff --git a/examples/mnist/nets/dummy_nn/FNN_s42_8.onnx b/examples/mnist/nets/dummy_nn/FNN_s42_8.onnx deleted file mode 100644 index b90876247690a56df4c05c45f510e125555449ea..0000000000000000000000000000000000000000 Binary files a/examples/mnist/nets/dummy_nn/FNN_s42_8.onnx and /dev/null differ diff --git a/examples/mnist/nets/dummy_nn/pruned_FNN_s42_012.onnx b/examples/mnist/nets/dummy_nn/pruned_FNN_s42_012.onnx deleted file mode 100644 index 57fae5e69c88542b3560b5d57ce11c993071b6cf..0000000000000000000000000000000000000000 Binary files a/examples/mnist/nets/dummy_nn/pruned_FNN_s42_012.onnx and /dev/null differ diff --git a/examples/mnist/nets/dummy_nn/pruned_FNN_s42_8.onnx b/examples/mnist/nets/dummy_nn/pruned_FNN_s42_8.onnx deleted file mode 100644 index 206b44063e62a18a764f5c24a3e073a057082766..0000000000000000000000000000000000000000 Binary files a/examples/mnist/nets/dummy_nn/pruned_FNN_s42_8.onnx and /dev/null differ diff --git a/examples/mnist/nets/dummy_nn/train.py b/examples/mnist/nets/dummy_nn/train.py index 5d8505c9d8ebd7d7fa60767ecef1267938c617ab..a612bcf4489231889e2854ce13bb8252a1587ab4 100644 --- a/examples/mnist/nets/dummy_nn/train.py +++ b/examples/mnist/nets/dummy_nn/train.py @@ -15,14 +15,14 @@ from torchvision import transforms img_size = 14 SEED = 42 -STATE_PATH = f"{img_size}x{img_size}_FNN_s{SEED}.pth" -ONNX_PATH = f"{img_size}x{img_size}_FNN_s{SEED}.onnx" -PRUNED_MODEL_PATH = f"pruned_{img_size}x{img_size}_FNN_s{SEED}.pkl" -PRUNED_ONNX_PATH = f"pruned_{img_size}x{img_size}_FNN_s{SEED}.onnx" -FNN_PRE_PATH = f"fnn_pre_s{SEED}.pth" -FNN_PRE_ONNX_PATH = f"fnn_pre_s{SEED}.onnx" -FNN_POST_PATH = f"fnn_post_s{SEED}.pth" -FNN_POST_ONNX_PATH = f"fnn_post_s{SEED}.onnx" +STATE_PATH = f"FNN_{img_size}x{img_size}_s{SEED}.pth" +ONNX_PATH = f"FNN_{img_size}x{img_size}_s{SEED}.onnx" +PRUNED_MODEL_PATH = f"FNN_{img_size}x{img_size}_pruned_s{SEED}.pkl" +PRUNED_ONNX_PATH = f"FNN_{img_size}x{img_size}_pruned_s{SEED}.onnx" +FNN_PRE_PATH = f"FNN_28x28_pre_s{SEED}.pth" +FNN_PRE_ONNX_PATH = f"FNN_28x28_pre_s{SEED}.onnx" +FNN_POST_PATH = f"FNN_28x28_post_s{SEED}.pth" +FNN_POST_ONNX_PATH = f"FNN_28x28_post_s{SEED}.onnx" torch.manual_seed(SEED) diff --git a/examples/mnist/nets/dummy_nn/pruned_14x14_FNN_s42.onnx b/examples/mnist/nets/pruned/FNN_14x14_pruned_s42.onnx similarity index 100% rename from examples/mnist/nets/dummy_nn/pruned_14x14_FNN_s42.onnx rename to examples/mnist/nets/pruned/FNN_14x14_pruned_s42.onnx diff --git a/examples/mnist/nets/dummy_nn/14x14_FNN_s42.onnx b/examples/mnist/nets/pruned/FNN_14x14_s42.onnx similarity index 100% rename from examples/mnist/nets/dummy_nn/14x14_FNN_s42.onnx rename to examples/mnist/nets/pruned/FNN_14x14_s42.onnx diff --git a/examples/mnist/nets/dummy_nn/pruned_FNN_s42.onnx b/examples/mnist/nets/pruned/FNN_28x28_pruned_s42.onnx similarity index 100% rename from examples/mnist/nets/dummy_nn/pruned_FNN_s42.onnx rename to examples/mnist/nets/pruned/FNN_28x28_pruned_s42.onnx diff --git a/examples/mnist/nets/dummy_nn/FNN_s42.onnx b/examples/mnist/nets/pruned/FNN_28x28_s42.onnx similarity index 100% rename from examples/mnist/nets/dummy_nn/FNN_s42.onnx rename to examples/mnist/nets/pruned/FNN_28x28_s42.onnx diff --git a/examples/mnist/nets/dummy_nn/fnn_post_s42.onnx b/examples/mnist/nets/splitted/FNN_28x28_post_s42.onnx similarity index 100% rename from examples/mnist/nets/dummy_nn/fnn_post_s42.onnx rename to examples/mnist/nets/splitted/FNN_28x28_post_s42.onnx diff --git a/examples/mnist/nets/dummy_nn/fnn_pre_s42.onnx b/examples/mnist/nets/splitted/FNN_28x28_pre_s42.onnx similarity index 100% rename from examples/mnist/nets/dummy_nn/fnn_pre_s42.onnx rename to examples/mnist/nets/splitted/FNN_28x28_pre_s42.onnx diff --git a/tests/check_pruning.t b/tests/check_pruning.t index adb8e56e50b424a7d5bc69a8444be7faf8545180..a74ec0cd0af6562127da5bb4e7fb0877260fb7e8 100644 --- a/tests/check_pruning.t +++ b/tests/check_pruning.t @@ -4,4 +4,4 @@ acasxu mnist -# $ caisar verify --prover PyRAT --ltag=StackTrace --define model_filename:nets/dummy_nn/FNN_s42.onnx --define pruned_model_filename:nets/dummy_nn/pruned_FNN_s42.onnx --define dataset_filename:csv/single_image.csv ../examples/mnist/check_pruning.mlw -v +# $ caisar verify --prover PyRAT --ltag=StackTrace --define model_filename:nets/pruned/FNN_28x28_s42.onnx --define pruned_model_filename:nets/pruned/FNN_28x28_pruned_s42.onnx --define dataset_filename:csv/single_image.csv ../examples/mnist/check_pruning.mlw -v diff --git a/tests/dune b/tests/dune index 0020300b1984c8232c08857a9fee5e67480add05..704b446aa99c0472b0e75b6acf4216e9e64add84 100644 --- a/tests/dune +++ b/tests/dune @@ -36,8 +36,8 @@ (glob_files bin/*) filter_tmpdir.sh ../examples/mnist/check_pruning.mlw - ../examples/mnist/nets/dummy_nn/FNN_s42.onnx - ../examples/mnist/nets/dummy_nn/pruned_FNN_s42.onnx + ../examples/mnist/nets/pruned/FNN_28x28_s42.onnx + ../examples/mnist/nets/pruned/FNN_28x28_pruned_s42.onnx ../examples/mnist/csv/single_image.csv ) (package caisar)) @@ -51,8 +51,8 @@ (glob_files bin/*) filter_tmpdir.sh ../examples/mnist/splitted_nn.mlw - ../examples/mnist/nets/dummy_nn/fnn_pre_s42.onnx - ../examples/mnist/nets/dummy_nn/fnn_post_s42.onnx + ../examples/mnist/nets/splitted/FNN_28x28_pre_s42.onnx + ../examples/mnist/nets/splitted/FNN_28x28_post_s42.onnx ../examples/mnist/csv/single_image.csv ) (package caisar)) diff --git a/tests/splitted_nn.t b/tests/splitted_nn.t index b03f526ed01b28e3ac030ab60a65308a5794c727..611987d8b77d3e8eef7787157005643b99fa8bf0 100644 --- a/tests/splitted_nn.t +++ b/tests/splitted_nn.t @@ -4,4 +4,4 @@ acasxu mnist -# $ caisar verify --prover PyRAT --ltag=StackTrace --define pre_model_filename:nets/dummy_nn/fnn_pre_s42.onnx --define post_model_filename:nets/dummy_nn/fnn_post_s42.onnx --define dataset_filename:csv/single_image.csv ../examples/mnist/splitted_nn.mlw -v +# $ caisar verify --prover PyRAT --ltag=StackTrace --define pre_model_filename:nets/splitted/FNN_28x28_pre_s42.onnx --define post_model_filename:nets/splitted/FNN_28x28_post_s42.onnx --define dataset_filename:csv/single_image.csv ../examples/mnist/splitted_nn.mlw -v