Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ACCWaitDirective and async keyword on kernels, enter data, parallel (fixed #1664) #2070

Closed
wants to merge 2 commits into from
Closed

Add ACCWaitDirective and async keyword on kernels, enter data, parallel (fixed #1664) #2070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27d51f9
#2070 ACC async_queue via mixins
svalat Sep 11, 2023
701f728
Merge branch 'master' into feature/acc-wait-directive
arporter Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/psyclone/domain/lfric/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@
'LFRicExtractDriverCreator',
'LFRicInvoke',
'LFRicLoopBounds',
'LFRicSymbolTable']
'LFRicSymbolTable']
7 changes: 3 additions & 4 deletions src/psyclone/domain/lfric/lfric_loop_bounds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
'''

Expand Down
5 changes: 4 additions & 1 deletion src/psyclone/f2pygen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion src/psyclone/psyir/nodes/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, \
Expand Down
Loading