[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 7e9baf2..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
 #! /usr/bin/python3
 import os
 import sys

-from generator_utils import *
+import generator_utils as gen

 
 template = """// @{generatedby}@
 /* ///////////////////////// The MPI Bugs Initiative ////////////////////////
 
 template = """// @{generatedby}@
 /* ///////////////////////// The MPI Bugs Initiative ////////////////////////


@@ -82,22 +82,22 @@ 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 = {}
         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['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
 
         # Generate the incorrect matching
         replace = patterns


@@ -105,4 +105,4 @@ for s in send + isend:
         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.'
         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)