stfc#2070 ACC async_queue via mixins

svalat · Sep 11, 2023 · 8a8d0f8 · 8a8d0f8
1 parent a13d987
commit 8a8d0f8
Show file tree

Hide file tree

Showing 9 changed files with 670 additions and 27 deletions.
diff --git a/src/psyclone/domain/lfric/__init__.py b/src/psyclone/domain/lfric/__init__.py
@@ -79,4 +79,4 @@
     'LFRicExtractDriverCreator',
     'LFRicInvoke',
     'LFRicLoopBounds',
-    'LFRicSymbolTable']
+    'LFRicSymbolTable']
diff --git a/src/psyclone/domain/lfric/lfric_loop_bounds.py b/src/psyclone/domain/lfric/lfric_loop_bounds.py
@@ -36,7 +36,7 @@
 # Modified J. Henrichs, Bureau of Meteorology
 # Modified A. B. G. Chalk and N. Nobre, STFC Daresbury Lab
 
-''' This module provides the LFRicLoopBounds Class that handles all variables 
+''' This module provides the LFRicLoopBounds Class that handles all variables
     required for specifying loop limits within an LFRic PSy-layer routine.'''
 
 # Imports
@@ -46,9 +46,8 @@
 
 
 class LFRicLoopBounds(LFRicCollection):
-
-    ''' 
-    Handles all variables required for specifying loop limits within 
+    '''
+    Handles all variables required for specifying loop limits within
     an LFRic PSy-layer routine.
     '''
 

diff --git a/src/psyclone/f2pygen.py b/src/psyclone/f2pygen.py
@@ -160,7 +160,10 @@ class ACCDirective(Directive):
                          'loop').
     '''
     def __init__(self, root, line, position, dir_type):
-        self._types = ["parallel", "kernels", "enter data", "loop", "routine"]
+        self._types = [
+            "parallel", "kernels", "enter data", "loop", "routine",
+            "wait"
+        ]
         self._positions = ["begin", "end"]
 
         super(ACCDirective, self).__init__(root, line, position, dir_type)

diff --git a/src/psyclone/psyir/nodes/__init__.py b/src/psyclone/psyir/nodes/__init__.py
@@ -81,7 +81,8 @@
 from psyclone.psyir.nodes.acc_directives import ACCDirective, \
     ACCLoopDirective, ACCEnterDataDirective, ACCParallelDirective, \
     ACCKernelsDirective, ACCDataDirective, ACCUpdateDirective, \
-    ACCStandaloneDirective, ACCRegionDirective, ACCRoutineDirective
+    ACCStandaloneDirective, ACCRegionDirective, ACCRoutineDirective, \
+    ACCWaitDirective
 from psyclone.psyir.nodes.omp_directives import OMPDirective, OMPDoDirective, \
     OMPParallelDirective, OMPParallelDoDirective, OMPSingleDirective, \
     OMPMasterDirective, OMPSerialDirective, OMPTaskloopDirective, \