From 1e77f9b669473408dae3f99f8cb0d95a822b9053 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Sun, 13 Jun 2021 21:48:26 +0200 Subject: [PATCH] Cleanup in .gitignore files; delete obsolete tesh file. [ci-skip] --- .gitignore | 6 +++ MANIFEST.in | 1 - examples/c/actor-create/.gitignore | 1 - examples/c/energy-vm/.gitignore | 1 - examples/cpp/actor-create/.gitignore | 1 - examples/cpp/io-file-system/.gitignore | 1 - examples/cpp/synchro-mutex/.gitignore | 1 - .../simdag/schedule-dotload/.gitignore | 2 - examples/smpi/mc/.gitignore | 5 --- examples/smpi/mc/non_deterministic.tesh | 37 ------------------- teshsuite/smpi/isp/umpire/.gitignore | 1 - tools/cmake/DefinePackages.cmake | 1 - tools/docker/.gitignore | 1 - 13 files changed, 6 insertions(+), 53 deletions(-) delete mode 100644 examples/c/actor-create/.gitignore delete mode 100644 examples/c/energy-vm/.gitignore delete mode 100644 examples/cpp/actor-create/.gitignore delete mode 100644 examples/cpp/io-file-system/.gitignore delete mode 100644 examples/cpp/synchro-mutex/.gitignore delete mode 100644 examples/deprecated/simdag/schedule-dotload/.gitignore delete mode 100644 examples/smpi/mc/.gitignore delete mode 100644 examples/smpi/mc/non_deterministic.tesh delete mode 100644 teshsuite/smpi/isp/umpire/.gitignore delete mode 100644 tools/docker/.gitignore diff --git a/.gitignore b/.gitignore index d57fe08b2d..83b2d1250a 100644 --- a/.gitignore +++ b/.gitignore @@ -251,6 +251,11 @@ examples/smpi/mc/smpi_bugged1 examples/smpi/mc/smpi_bugged1_liveness examples/smpi/mc/smpi_bugged2 examples/smpi/mc/smpi_mutual_exclusion +examples/smpi/mc/smpi_non_termination1 +examples/smpi/mc/smpi_non_termination2 +examples/smpi/mc/smpi_non_termination3 +examples/smpi/mc/smpi_non_termination4 +examples/smpi/mc/smpi_only_send_deterministic examples/smpi/mc/smpi_sendsend examples/smpi/NAS/dt examples/smpi/NAS/ep @@ -334,6 +339,7 @@ teshsuite/smpi/io-ordered/io-ordered teshsuite/smpi/io-shared/io-shared teshsuite/smpi/io-simple-at/io-simple-at teshsuite/smpi/io-simple/io-simple +teshsuite/smpi/isp/umpire/**/*.tesh teshsuite/smpi/isp/umpire/abort teshsuite/smpi/isp/umpire/abort1 teshsuite/smpi/isp/umpire/abort2 diff --git a/MANIFEST.in b/MANIFEST.in index a2f736dfc1..22deee0219 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1962,7 +1962,6 @@ include examples/python/comm-waitall/comm-waitall_d.xml include examples/python/comm-waitany/comm-waitany_d.xml include examples/smpi/CMakeLists.txt include examples/smpi/NAS/CMakeLists.txt -include examples/smpi/mc/non_deterministic.tesh include examples/smpi/mc/only_send_deterministic.tesh include examples/smpi/replay_multiple/CMakeLists.txt include examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt diff --git a/examples/c/actor-create/.gitignore b/examples/c/actor-create/.gitignore deleted file mode 100644 index c6a8ca44db..0000000000 --- a/examples/c/actor-create/.gitignore +++ /dev/null @@ -1 +0,0 @@ -actor-create-c diff --git a/examples/c/energy-vm/.gitignore b/examples/c/energy-vm/.gitignore deleted file mode 100644 index 59c6fd40f4..0000000000 --- a/examples/c/energy-vm/.gitignore +++ /dev/null @@ -1 +0,0 @@ -energy_vm diff --git a/examples/cpp/actor-create/.gitignore b/examples/cpp/actor-create/.gitignore deleted file mode 100644 index 7cef20dc0e..0000000000 --- a/examples/cpp/actor-create/.gitignore +++ /dev/null @@ -1 +0,0 @@ -s4u_launching diff --git a/examples/cpp/io-file-system/.gitignore b/examples/cpp/io-file-system/.gitignore deleted file mode 100644 index fa4d4956b6..0000000000 --- a/examples/cpp/io-file-system/.gitignore +++ /dev/null @@ -1 +0,0 @@ -s4u_io_test diff --git a/examples/cpp/synchro-mutex/.gitignore b/examples/cpp/synchro-mutex/.gitignore deleted file mode 100644 index 0ace5ca849..0000000000 --- a/examples/cpp/synchro-mutex/.gitignore +++ /dev/null @@ -1 +0,0 @@ -s4u_actor diff --git a/examples/deprecated/simdag/schedule-dotload/.gitignore b/examples/deprecated/simdag/schedule-dotload/.gitignore deleted file mode 100644 index 84e2127aec..0000000000 --- a/examples/deprecated/simdag/schedule-dotload/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -ptg_test -dot.dot diff --git a/examples/smpi/mc/.gitignore b/examples/smpi/mc/.gitignore deleted file mode 100644 index daf627a874..0000000000 --- a/examples/smpi/mc/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -smpi_non_termination1 -smpi_non_termination2 -smpi_non_termination3 -smpi_non_termination4 -smpi_only_send_deterministic diff --git a/examples/smpi/mc/non_deterministic.tesh b/examples/smpi/mc/non_deterministic.tesh deleted file mode 100644 index 904088ba1d..0000000000 --- a/examples/smpi/mc/non_deterministic.tesh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env tesh - -! timeout 60 -$ ../../../smpi_script/bin/smpirun -wrapper ${bindir:=.}/../../../bin/simgrid-mc -hostfile ${srcdir:=.}/hostfile_non_deterministic -platform ${srcdir:=.}/../../platforms/cluster_backbone.xml --log=xbt_cfg.thresh:warning --cfg=model-check/communications-determinism:1 --cfg=smpi/send-is-detached-thresh:0 --cfg=smpi/host-speed:1Gf ./smpi_non_deterministic -> [0.000000] [mc_global/INFO] Check communication determinism -> [0.000000] [mc_comm_determinism/INFO] The communications pattern of the process 1 is different! (Different communication : 1) -> [0.000000] [mc_comm_determinism/INFO] **************************************************** -> [0.000000] [mc_comm_determinism/INFO] ***** Non-deterministic communications pattern ***** -> [0.000000] [mc_comm_determinism/INFO] **************************************************** -> [0.000000] [mc_comm_determinism/INFO] ** Initial communications pattern (per process): ** -> [0.000000] [mc_comm_determinism/INFO] Communications from the process 1: -> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.simgrid.org <- (2) node-2.simgrid.org] iRecv -> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.simgrid.org -> (2) node-2.simgrid.org] iSend -> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.simgrid.org <- (3) node-3.simgrid.org] iRecv -> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.simgrid.org -> (3) node-3.simgrid.org] iSend -> [0.000000] [mc_comm_determinism/INFO] Communications from the process 2: -> [0.000000] [mc_comm_determinism/INFO] [(2) node-2.simgrid.org -> (1) node-1.simgrid.org] iSend -> [0.000000] [mc_comm_determinism/INFO] [(2) node-2.simgrid.org <- (1) node-1.simgrid.org] iRecv -> [0.000000] [mc_comm_determinism/INFO] Communications from the process 3: -> [0.000000] [mc_comm_determinism/INFO] [(3) node-3.simgrid.org -> (1) node-1.simgrid.org] iSend -> [0.000000] [mc_comm_determinism/INFO] [(3) node-3.simgrid.org <- (1) node-1.simgrid.org] iRecv -> [0.000000] [mc_comm_determinism/INFO] ** Communications pattern counter-example (per process): ** -> [0.000000] [mc_comm_determinism/INFO] Communications from the process 1: -> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.simgrid.org <- (3) node-3.simgrid.org] iRecv -> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.simgrid.org -> (3) node-3.simgrid.org] iSend -> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.simgrid.org <- (2) node-2.simgrid.org] iRecv -> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.simgrid.org -> (2) node-2.simgrid.org] iSend -> [0.000000] [mc_comm_determinism/INFO] Communications from the process 2: -> [0.000000] [mc_comm_determinism/INFO] [(2) node-2.simgrid.org -> (1) node-1.simgrid.org] iSend -> [0.000000] [mc_comm_determinism/INFO] [(2) node-2.simgrid.org <- (1) node-1.simgrid.org] iRecv -> [0.000000] [mc_comm_determinism/INFO] Communications from the process 3: -> [0.000000] [mc_comm_determinism/INFO] [(3) node-3.simgrid.org -> (1) node-1.simgrid.org] iSend -> [0.000000] [mc_comm_determinism/INFO] [(3) node-3.simgrid.org <- (1) node-1.simgrid.org] iRecv -> [0.000000] [mc_global/INFO] Expanded states = 16037 -> [0.000000] [mc_global/INFO] Visited states = 80801 -> [0.000000] [mc_global/INFO] Executed transitions = 76048 -> [0.000000] [mc_global/INFO] Communication-deterministic : No diff --git a/teshsuite/smpi/isp/umpire/.gitignore b/teshsuite/smpi/isp/umpire/.gitignore deleted file mode 100644 index 06fb7b0967..0000000000 --- a/teshsuite/smpi/isp/umpire/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.tesh diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index acdc654d22..394220c464 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -80,7 +80,6 @@ set(EXTRA_DIST tools/lualib.patch teshsuite/lua/lua_platforms.tesh examples/smpi/mc/only_send_deterministic.tesh - examples/smpi/mc/non_deterministic.tesh ) set(SMPI_SRC diff --git a/tools/docker/.gitignore b/tools/docker/.gitignore deleted file mode 100644 index 397b4a7624..0000000000 --- a/tools/docker/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.log -- 2.20.1