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.

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

Raise error if ignore_directives=False but ignore_comments=True #2840

Merged
merged 4 commits into from
Jan 8, 2025

Conversation

jwallwork23
Copy link
Collaborator

Closes #2839.

I've just been testing out the new ignore_comments and ignore_directives functionality and think it'll be really useful.

However, I noticed that it's possible to set ignore_directives=False with ignore_comments=True, which negates the ignore_directives option choice. Personally, I think this combination should raise an error.

@jwallwork23 jwallwork23 added the bug label Jan 8, 2025
@jwallwork23 jwallwork23 self-assigned this Jan 8, 2025
Copy link

codecov bot commented Jan 8, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 99.88%. Comparing base (9b8a0ba) to head (e6aeb10).
Report is 5 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #2840   +/-   ##
=======================================
  Coverage   99.88%   99.88%           
=======================================
  Files         359      359           
  Lines       50258    50264    +6     
=======================================
+ Hits        50202    50208    +6     
  Misses         56       56           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@jwallwork23 jwallwork23 added ready for review NG-ARCH Issues relevant to the GPU parallelisation of LFRic and other models expected to be used in NG-ARCH labels Jan 8, 2025
Copy link
Member

@arporter arporter left a comment

Choose a reason for hiding this comment

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

Thanks for tidying this up Joe. Just a couple of small things to fix up. I'll run the integration tests in the meantime (although they should be unaffected).

src/psyclone/psyir/frontend/fortran.py Show resolved Hide resolved
src/psyclone/psyir/frontend/fortran.py Outdated Show resolved Hide resolved
@jwallwork23 jwallwork23 requested a review from arporter January 8, 2025 13:45
Copy link
Member

@arporter arporter left a comment

Choose a reason for hiding this comment

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

All good now, thanks very much.
Will just have to wait on the integration tests so will be about an hour.

@jwallwork23
Copy link
Collaborator Author

All good now, thanks very much. Will just have to wait on the integration tests so will be about an hour.

Okay great. Thanks for the review @arporter!

@arporter
Copy link
Member

arporter commented Jan 8, 2025

The integration tests were (eventually) all green.

@arporter arporter merged commit 93741fd into master Jan 8, 2025
13 checks passed
@arporter arporter deleted the 2839_ignore-directives-negated branch January 8, 2025 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug NG-ARCH Issues relevant to the GPU parallelisation of LFRic and other models expected to be used in NG-ARCH ready to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ignore_directives can be False if ignore_comments is True
2 participants