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

Jump to bottom

Initial support for generating an OpenCL PSy layer #216

Merged
merged 68 commits into from
Jan 31, 2019
Merged

Initial support for generating an OpenCL PSy layer #216

merged 68 commits into from
Jan 31, 2019

Conversation

arporter
Copy link
Member

This PR is for #174 and adds initial support for creating OpenCL PSy layers for the GOcean API.

arporter added 30 commits June 15, 2018 11:18
@arporter
#174 add opencl option and generate use statements in psy module
bb0a42a
@arporter
#174 add first OCL test for gocean
dd3309c
@arporter
#174 add new OCLTrans() transformation
585eafb
@arporter
#174 rm opencl from constructor and have as member of Schedule
6c0a570
@arporter
#174 generate code to set kernel args
9f161c0
@arporter
#174 no explicit loops for ocl
e71012f
@arporter
#174 add call to set kernel args before each kernel call
b540c75
@arporter
#174 add Fortran OpenCLn utility code
c998f56
@arporter
#174 add option to read kernel filename from env var. Allow add_kerne…
aeb3563 
…ls() to be called multiple times.
@arporter
#174 add the target attribute to DeclGen
1de9969
@arporter
#174 add if(first_time) section to psy
7b776ff
@arporter
#174 add calls to copy fields to device
26331cb
@arporter
#174 add expected arg-setting code to test [skip ci]
26b074b
@arporter
#174 add new gen_ocl_init() to create ocl-initialisation routine in P…
0ccd814 
…Sy module
@arporter
#174 add x-failing test for psy_init()
646f8f0
@arporter
#174 rm opencl arg from factory and generate
a9fd14d
@arporter
#174 support grid-property kernel args
5973b30
@arporter
#174 add property decorator to OCLTrans.name
97c2186
@arporter
#174 use c_sizeof instead of sizeof. Avoid setting scalar args [skip ci]
5838fc4
@arporter
#174 WIP updating declarations of quantities in PSy layer [skip ci]
7fa79e5
@arporter
#174 bring branch up-to-date with master (after declgen refactor)
03e1c2f
@arporter
#174 rm duplicate target attribute after merge [skip ci]
125f173
@arporter
#174 correct type of kernel-name list [skip ci]
17e0b55
@arporter
#174 mv gen of set-kern-args into gocean1p0 [skip ci]
9d86ace
@arporter
#174 ensure ocl-init routine only executed once [skip ci]
594fdbe
@arporter
#174 create device buffer for each field
91ec86c
@arporter
#174 add arg index and name to setkernelarg message [skip ci]
3dc8fee
@arporter
#174 add code to set kernel argument for nx [skip ci]
1fd2f24
@arporter
#174 add code to set-up grid property arrays on device [skip ci]
d3fd8d5
@arporter
#174 correct kind of globalsize and use c_sizeof to calculate device …
92b3319 
…buffer size [skip ci]
rupertford
rupertford suggested changes Jan 29, 2019
View reviewed changes
Copy link
Collaborator

@rupertford rupertford left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've now done the pycodestyle and pylint checks. I have a few minor comments remaining.

All comments are inline. 2 are new, and there are a few remaining comments from the previous review.

src/psyclone/psyGen.py Outdated Show resolved Hide resolved
src/psyclone/tests/gocean1p0_opencl_test.py Show resolved Hide resolved
@rupertford
Copy link
Collaborator

Back to @arporter. Really close now. Just some very minor changes requested.

@arporter
Copy link
Member Author

From me to you (@rupertford)

rupertford
rupertford suggested changes Jan 30, 2019
View reviewed changes
Copy link
Collaborator

@rupertford rupertford left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry to bounce this back but the following modified lines are not covered:

918, 965, 972 in gocean1p0.py

@arporter
Copy link
Member Author

Oh yes. Apologies. Upon investigating I've discovered that GOKernelArguments and GOKern both have a find_grid_access() and they appear to be identical. I shall do some tidying...

@arporter
Copy link
Member Author

I think I must have intended to refactor and only got half-way through. I've been able to remove a fair bit of duplicated code and thus get rid of the uncovered lines :-)
Ready for another review from @rupertford.

rupertford
rupertford approved these changes Jan 31, 2019
View reviewed changes
Copy link
Collaborator

@rupertford rupertford left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All issues have been addressed. Changes look good. pycodestyle and pylint are happy. Examples run. All tests pass etc.

Approving.

@rupertford rupertford merged commit 8f99527 into master Jan 31, 2019
@rupertford rupertford deleted the opencl_psy branch January 31, 2019 15:14
@rupertford rupertford mentioned this pull request Jan 31, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rupertford rupertford rupertford approved these changes

Assignees

@arporter arporter

Labels
under review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@arporter @coveralls @codecov-io @rupertford