[MBI] Import generator_utils as gen.

[simgrid.git] / teshsuite / smpi / MBI / P2PMatchingANYSRCGenerator.py

diff --git a/teshsuite/smpi/MBI/P2PMatchingANYSRCGenerator.py b/teshsuite/smpi/MBI/P2PMatchingANYSRCGenerator.py
index 4576864..0c32f7c 100755 (executable)
--- a/teshsuite/smpi/MBI/P2PMatchingANYSRCGenerator.py
+++ b/teshsuite/smpi/MBI/P2PMatchingANYSRCGenerator.py
@@ -1,7 +1,7 @@
 #! /usr/bin/python3
 import os
 import sys
-from generator_utils import *
+import generator_utils as gen
 
 template = """// @{generatedby}@
 /* ///////////////////////// The MPI Bugs Initiative ////////////////////////
@@ -11,17 +11,17 @@ template = """// @{generatedby}@
   Description: @{shortdesc}@
     @{longdesc}@
 
-       Version of MPI: Conforms to MPI 1.1, does not require MPI 2 implementation
+  Version of MPI: Conforms to MPI 1.1, does not require MPI 2 implementation
 
 BEGIN_MPI_FEATURES
-       P2P!basic: @{p2pfeature}@ 
-       P2P!nonblocking: @{ip2pfeature}@
-       P2P!persistent: Lacking
-       COLL!basic: Lacking
-       COLL!nonblocking: Lacking
-       COLL!persistent: Lacking
-       COLL!tools: Lacking
-       RMA: Lacking
+  P2P!basic: @{p2pfeature}@
+  P2P!nonblocking: @{ip2pfeature}@
+  P2P!persistent: Lacking
+  COLL!basic: Lacking
+  COLL!nonblocking: Lacking
+  COLL!persistent: Lacking
+  COLL!tools: Lacking
+  RMA: Lacking
 END_MPI_FEATURES
 
 BEGIN_MBI_TESTS
@@ -39,9 +39,9 @@ END_MBI_TESTS
 int main(int argc, char **argv) {
   int nprocs = -1;
   int rank = -1;
-       int src=MPI_ANY_SOURCE, dest=0;
-       int stag = 42, rtag = MPI_ANY_TAG;
-       int buff_size = 1;
+  int src=MPI_ANY_SOURCE, dest=0;
+  int stag = 42, rtag = MPI_ANY_TAG;
+  int buff_size = 1;
 
   MPI_Init(&argc, &argv);
   MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
@@ -51,28 +51,27 @@ int main(int argc, char **argv) {
   if (nprocs < 2)
     printf("MBI ERROR: This test needs at least 2 processes to produce a bug!\\n");
 
-       int recv_buffer=-1;
-       int send_buffer=rank;
+  int send_buffer=rank;
 
-       MPI_Datatype type = MPI_INT;
-       MPI_Comm newcom = MPI_COMM_WORLD;
+  MPI_Datatype type = MPI_INT;
+  MPI_Comm newcom = MPI_COMM_WORLD;
 
   @{init1}@
   @{init2}@
 
   if (rank == 0) {
     for (int i = 0; i < nprocs - 1; i++) {
-               @{operation1}@ /* MBIERROR */
-                       @{fini1}@
+      @{operation1}@ /* MBIERROR */
+      @{fini1}@
     }
-       if (@{cond}@ != 3) {
-      printf("MBI_MSG_RACE: The last received message is not 3 but %d!\\n", recv_buffer);
+  if (@{cond}@ != 3) {
+      printf("MBI_MSG_RACE: The last received message is not 3 but %d!\\n", buf1);
       fflush(stdout);
       abort();
     }
   }else{
-       @{operation2}@
-               @{fini2}@
+    @{operation2}@
+    @{fini2}@
   }
 
 
@@ -83,28 +82,27 @@ int main(int argc, char **argv) {
 """
 
 
-for s in send + isend:
-    for r in recv + irecv:
+for s in gen.send + gen.isend:
+    for r in gen.recv + gen.irecv:
         patterns = {}
         patterns = {'s': s, 'r': r}
         patterns['generatedby'] = f'DO NOT EDIT: this file was generated by {os.path.basename(sys.argv[0])}. DO NOT EDIT.'
-        patterns['p2pfeature'] = 'Yes' if s in send or r in recv else 'Lacking'
-        patterns['ip2pfeature'] = 'Yes' if s in isend or r in irecv else 'Lacking'
+        patterns['p2pfeature'] = 'Yes' if s in gen.send or r in gen.recv else 'Lacking'
+        patterns['ip2pfeature'] = 'Yes' if s in gen.isend or r in gen.irecv else 'Lacking'
         patterns['s'] = s
         patterns['r'] = r
         patterns['cond'] = 'buf1'
-        patterns['init2'] = init[s]("2")
-        patterns['init1'] = init[r]("1")
-        patterns['fini2'] = fini[s]("2")
-        patterns['fini1'] = fini[r]("1")
-        patterns['operation2'] = operation[s]("2")
-        patterns['operation1'] = operation[r]("1")
+        patterns['init2'] = gen.init[s]("2")
+        patterns['init1'] = gen.init[r]("1")
+        patterns['fini2'] = gen.fini[s]("2")
+        patterns['fini1'] = gen.fini[r]("1")
+        patterns['operation2'] = gen.operation[s]("2")
+        patterns['operation1'] = gen.operation[r]("1")
 
         # Generate the incorrect matching
-        replace = patterns 
+        replace = patterns
         replace['shortdesc'] = 'The message ordering is non-deterministic.'
-        replace['longdesc'] = f'The code assumes a fixed order in the reception of messages while the message ordering is non-deterministic.' 
-        replace['outcome'] = 'ERROR: MessageRace' 
+        replace['longdesc'] = f'The code assumes a fixed order in the reception of messages while the message ordering is non-deterministic.'
+        replace['outcome'] = 'ERROR: MessageRace'
         replace['errormsg'] = 'P2P message race which can cause a deadlock. @{r}@ at @{filename}@:@{line:MBIERROR}@ is called with ANY_SRC.'
-        make_file(template, f'MessageRace_{r}_{s}_nok.c', replace)
-
+        gen.make_file(template, f'MessageRace_{r}_{s}_nok.c', replace)