[MBI] Import generator_utils as gen.

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

diff --git a/teshsuite/smpi/MBI/P2PInvalidComGenerator.py b/teshsuite/smpi/MBI/P2PInvalidComGenerator.py
index 87deaa1..fc9e673 100755 (executable)
--- a/teshsuite/smpi/MBI/P2PInvalidComGenerator.py
+++ b/teshsuite/smpi/MBI/P2PInvalidComGenerator.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 ////////////////////////
@@ -77,27 +77,27 @@ int main(int argc, char **argv) {
 """
 
 
-for p1 in send + isend + psend:
-    for p2 in recv + irecv + precv:
+for p1 in gen.send + gen.isend + gen.psend:
+    for p2 in gen.recv + gen.irecv + gen.precv:
         patterns = {}
         patterns = {'p1': p1, 'p2': p2}
         patterns['origin'] = "MBI"
         patterns['generatedby'] = f'DO NOT EDIT: this file was generated by {os.path.basename(sys.argv[0])}. DO NOT EDIT.'
-        patterns['p2pfeature'] = 'Yes' if p1 in send or p2 in recv  else 'Lacking'
-        patterns['ip2pfeature'] = 'Yes' if p1 in isend or p2 in irecv  else 'Lacking'
-        patterns['persfeature'] = 'Yes' if p1 in psend or p2 in precv  else 'Lacking'
+        patterns['p2pfeature'] = 'Yes' if p1 in gen.send or p2 in gen.recv  else 'Lacking'
+        patterns['ip2pfeature'] = 'Yes' if p1 in gen.isend or p2 in gen.irecv  else 'Lacking'
+        patterns['persfeature'] = 'Yes' if p1 in gen.psend or p2 in gen.precv  else 'Lacking'
         patterns['p1'] = p1
         patterns['p2'] = p2
-        patterns['init1'] = init[p1]("1")
-        patterns['init2'] = init[p2]("2")
-        patterns['start1'] = start[p1]("1")
-        patterns['start2'] = start[p2]("2")
-        patterns['fini1'] = fini[p1]("1")
-        patterns['fini2'] = fini[p2]("2")
-        patterns['operation1'] = operation[p1]("1") #send
-        patterns['operation2'] = operation[p2]("2") #recv
-        patterns['free1'] = free[p1]("1")
-        patterns['free2'] = free[p2]("2")
+        patterns['init1'] = gen.init[p1]("1")
+        patterns['init2'] = gen.init[p2]("2")
+        patterns['start1'] = gen.start[p1]("1")
+        patterns['start2'] = gen.start[p2]("2")
+        patterns['fini1'] = gen.fini[p1]("1")
+        patterns['fini2'] = gen.fini[p2]("2")
+        patterns['operation1'] = gen.operation[p1]("1") #send
+        patterns['operation2'] = gen.operation[p2]("2") #recv
+        patterns['free1'] = gen.free[p1]("1")
+        patterns['free2'] = gen.free[p2]("2")
         patterns['change_com1'] = ""
         patterns['change_com2'] = ""
 
@@ -108,7 +108,7 @@ for p1 in send + isend + psend:
         replace['outcome'] = 'ERROR: InvalidCommunicator'
         replace['errormsg'] = 'Invalid Communicator. @{p2}@ at @{filename}@:@{line:MBIERROR2}@ uses a null communicator.'
         replace['change_com2'] = 'newcom = MPI_COMM_NULL;'
-        make_file(template, f'InvalidParam_ComNull_{p2}_{p1}nok.c', replace)
+        gen.make_file(template, f'InvalidParam_ComNull_{p2}_{p1}nok.c', replace)
 
         replace = patterns
         replace['shortdesc'] = 'Point to point @{p2}@ has an invalid communicator'
@@ -117,4 +117,4 @@ for p1 in send + isend + psend:
         replace['errormsg'] = 'Invalid Communicator. @{p1}@ at @{filename}@:@{line:MBIERROR1}@ uses a null communicator.'
         replace['change_com1'] = 'newcom = MPI_COMM_NULL;'
         replace['change_com2'] = ""
-        make_file(template, f'InvalidParam_ComNull_{p1}_{p2}nok.c', replace)
+        gen.make_file(template, f'InvalidParam_ComNull_{p1}_{p2}nok.c', replace)