[MBI] Import generator_utils as gen.

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

diff --git a/teshsuite/smpi/MBI/CollTopoGenerator.py b/teshsuite/smpi/MBI/CollTopoGenerator.py
index 00c06ae..ab54e52 100755 (executable)
--- a/teshsuite/smpi/MBI/CollTopoGenerator.py
+++ b/teshsuite/smpi/MBI/CollTopoGenerator.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: Lacking
-       P2P!nonblocking: Lacking
-       P2P!persistent: Lacking
-       COLL!basic: Lacking
-       COLL!nonblocking: Lacking
-       COLL!persistent: Lacking
-       COLL!tools: @{toolfeature}@
-       RMA: Lacking
+  P2P!basic: Lacking
+  P2P!nonblocking: Lacking
+  P2P!persistent: Lacking
+  COLL!basic: Lacking
+  COLL!nonblocking: Lacking
+  COLL!persistent: Lacking
+  COLL!tools: @{toolfeature}@
+  RMA: Lacking
 END_MPI_FEATURES
 
 BEGIN_MBI_TESTS
@@ -49,14 +49,14 @@ int main(int argc, char **argv) {
   if (nprocs < 2)
     printf("MBI ERROR: This test needs at least 2 processes to produce a bug!\\n");
 
-        MPI_Comm newcom;
+   MPI_Comm newcom;
    int dims[2], periods[2], coords[2];
    int source, dest;
    dims[0] = 2;
    dims[1] = 1;
    periods[0] = 1;
    periods[1] = 1;
- 
+
    @{change_dims}@
 
    MPI_Cart_create(MPI_COMM_WORLD, 2, dims, periods, 0, &newcom); /* create a cartesian communicator */
@@ -65,8 +65,8 @@ int main(int argc, char **argv) {
 
    @{init}@
    @{operation}@ /* MBIERROR2 */
-        @{fini}@
- 
+   @{fini}@
+
    if (newcom != MPI_COMM_NULL)
      MPI_Comm_free(&newcom);
 
@@ -76,17 +76,17 @@ int main(int argc, char **argv) {
 }
 """
 
-for c in tcoll4topo: 
+for c in gen.tcoll4topo:
     patterns = {}
     patterns = {'c': c}
     patterns['generatedby'] = f'DO NOT EDIT: this file was generated by {os.path.basename(sys.argv[0])}. DO NOT EDIT.'
-    patterns['toolfeature'] = 'Yes' if c in tcoll4topo else 'Lacking'
+    patterns['toolfeature'] = 'Yes' if c in gen.tcoll4topo else 'Lacking'
     patterns['c'] = c
-    patterns['init'] = init[c]("1")
-    patterns['fini'] = fini[c]("1")
-    patterns['operation'] = operation[c]("1")
+    patterns['init'] = gen.init[c]("1")
+    patterns['fini'] = gen.fini[c]("1")
+    patterns['operation'] = gen.operation[c]("1")
 
-    # Generate the correct code 
+    # Generate the correct code
     replace = patterns
     replace['shortdesc'] = 'Function @{c}@ with correct arguments'
     replace['longdesc'] = f'All ranks in comm call {c} with correct arguments'
@@ -94,7 +94,7 @@ for c in tcoll4topo:
     replace['errormsg'] = ''
     replace['change_com'] = '/* No error injected here */'
     replace['change_dims'] = '/* No error injected here */'
-    make_file(template, f'InvalidParam_{c}_ok.c', replace)
+    gen.make_file(template, f'InvalidParam_{c}_ok.c', replace)
 
     # Generate the incorrect code
     replace = patterns
@@ -103,23 +103,23 @@ for c in tcoll4topo:
     replace['outcome'] = 'ERROR: InvalidCommunicator'
     replace['errormsg'] = 'Invalid Communicator in a collective. @{c}@ at @{filename}@:@{line:MBIERROR2}@ tries to get cartesian information of MPI_COMM_WORLD.'
     replace['change_com'] = 'newcom = MPI_COMM_WORLD; /* MBIERROR1 */'
-    make_file(template, f'InvalidParam_Com_{c}_nok.c', replace)
+    gen.make_file(template, f'InvalidParam_Com_{c}_nok.c', replace)
 
     # Generate the code with newcom=MPI_COMM_NULL
     replace = patterns
-    replace['shortdesc'] = 'Function @{c}@ called with comm=MPI_COMM_NULL' 
+    replace['shortdesc'] = 'Function @{c}@ called with comm=MPI_COMM_NULL'
     replace['longdesc'] = 'Function @{c}@ called with comm=MPI_COMM_NULL'
     replace['outcome'] = 'ERROR: InvalidCommunicator'
     replace['errormsg'] = 'Invalid communicator. @{c}@ at @{filename}@:@{line:MBIERROR2}@ has MPI_COMM_NULL as a communicator.'
     replace['change_com'] = 'newcom = MPI_COMM_NULL; /* MBIERROR1 */'
-    make_file(template, f'InvalidParam_ComNull_{c}_nok.c', replace)
+    gen.make_file(template, f'InvalidParam_ComNull_{c}_nok.c', replace)
 
     # Generate the code with invalid dimension
     replace = patterns
-    replace['shortdesc'] = 'Creates a cartesian communicator with a negative entry in the dims attribute' 
+    replace['shortdesc'] = 'Creates a cartesian communicator with a negative entry in the dims attribute'
     replace['longdesc'] = 'Creates a cartesian communicator with a negative entry in the dims attribute, which is a usage error'
     replace['outcome'] = 'ERROR: InvalidOtherArg'
     replace['errormsg'] = 'Invalid Argument. MPI_Cart_create has invalid dimensions.'
-    replace['change_com'] = "" 
+    replace['change_com'] = ""
     replace['change_dims'] = 'dims[0] = -2; dims[1] = -1; /* MBIERROR1 */'
-    make_file(template, f'InvalidParam_Dim_MPI_Cart_create_nok.c', replace)
+    gen.make_file(template, f'InvalidParam_Dim_MPI_Cart_create_nok.c', replace)