#2846 rm duplicated module inlining from GameOfLife solution scripts

Author: arporter

tutorial/training/gocean/2.10-GameOfLife-mpi/solution/openmp_combined.py

@@ -39,7 +39,6 @@
 encloses them all in an OpenMP parallel directive.
 '''
 
-from psyclone.domain.common.transformations import KernelModuleInlineTrans
 from psyclone.gocean1p0 import GOLoop
 from psyclone.psyGen import InvokeSchedule
 from psyclone.psyir.nodes import FileContainer
@@ -61,15 +60,12 @@ def trans(psyir: FileContainer) -> None:
     omp_parallel = OMPParallelTrans()
     # Optional argument: schedule
     omp_do = OMPLoopTrans(omp_schedule="dynamic")
-    module_inline = KernelModuleInlineTrans()
 
     # We know that there is only one schedule
     schedule = psyir.walk(InvokeSchedule)[0]
 
-    # Module inline all kernels to help gfortran with inlining.
-    for kern in schedule.kernels():
-        module_inline.apply(kern)
-
+    # Module inline all kernels to help gfortran with inlining
+    # and fuse loops.
     fuse_trans(psyir)
 
     for loop in schedule.walk(GOLoop):

tutorial/training/gocean/2.16-GameOfLife-omp-offload/solution/omp_offload.py

@@ -38,7 +38,6 @@
 It adds OpenMP offload directives to all kernels.
 '''
 
-from psyclone.domain.common.transformations import KernelModuleInlineTrans
 from psyclone.gocean1p0 import GOKern
 from psyclone.psyir.nodes import Directive, FileContainer, Loop, Routine
 from psyclone.psyir.transformations import TransformationError, OMPTargetTrans
@@ -58,14 +57,11 @@ def trans(psyir: FileContainer) -> None:
 
     declare_target = OMPDeclareTargetTrans()
 
-    # Use existing fuse script to fuse all loops
+    # Use existing fuse script to inline all kernels and fuse all loops
     fuse_trans(psyir)
 
-    # Module inline all kernels (so they can be modified)
-    # Then add an OpenMP routine statement to each of them:
-    module_inline = KernelModuleInlineTrans()
+    # Add an OpenMP routine statement to each of the kernels
     for kern in psyir.walk(GOKern):
-        module_inline.apply(kern)
         # Put a ``declare target`` directive inside each kernel
         try:
             declare_target.apply(kern)

tutorial/training/gocean/2.8-GameOfLife-openmp/solution/openmp.py

@@ -39,8 +39,7 @@
 to the code.
 '''
 
-from psyclone.domain.common.transformations import KernelModuleInlineTrans
-from psyclone.gocean1p0 import GOKern, GOLoop
+from psyclone.gocean1p0 import GOLoop
 from psyclone.transformations import OMPParallelLoopTrans
 from psyclone.psyGen import InvokeSchedule
 from psyclone.psyir.nodes import FileContainer
@@ -58,16 +57,11 @@ def trans(psyir: FileContainer) -> None:
     '''
     omp_parallel = OMPParallelLoopTrans(omp_schedule="dynamic")
     omp_parallel.omp_schedule = "static"
-    module_inline = KernelModuleInlineTrans()
 
     # We know that there is only one schedule
     schedule = psyir.walk(InvokeSchedule)[0]
 
-    # Inline all kernels to help gfortran with inlining.
-    for kern in schedule.walk(GOKern):
-        module_inline.apply(kern)
-
-    # Optional:
+    # Inline all kernels and fuse loops
     fuse_trans(psyir)
 
     for loop in schedule.walk(GOLoop):

tutorial/training/gocean/2.8-GameOfLife-openmp/solution/openmp_combined.py

@@ -39,8 +39,7 @@
 'omp do' to all loops and adds an outer `omp parallel`.
 '''
 
-from psyclone.domain.common.transformations import KernelModuleInlineTrans
-from psyclone.gocean1p0 import GOKern, GOLoop
+from psyclone.gocean1p0 import GOLoop
 from psyclone.psyGen import InvokeSchedule
 from psyclone.psyir.nodes import FileContainer
 from psyclone.psyir.transformations import OMPParallelTrans
@@ -60,16 +59,11 @@ def trans(psyir: FileContainer) -> None:
     omp_parallel = OMPParallelTrans()
     # Optional argument: schedule
     omp_do = OMPLoopTrans(omp_schedule="dynamic")
-    module_inline = KernelModuleInlineTrans()
 
     # We know that there is only one schedule
     schedule = psyir.walk(InvokeSchedule)[0]
 
-    # Inline all kernels to help gfortran with inlining.
-    for kern in schedule.walk(GOKern):
-        module_inline.apply(kern)
-
-    # Optional:
+    # Inline kernels and fuse loops
     fuse_trans(psyir)
 
     # Both ways work - either specify the default in