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

Quick fix for baseline generation #3107

Merged
merged 1 commit into from
Nov 13, 2024
Merged

Quick fix for baseline generation #3107

merged 1 commit into from
Nov 13, 2024

Conversation

jgfouca
Copy link
Member

@jgfouca jgfouca commented Nov 13, 2024

The seperate small kernel testing does not need to be (and should not) run when generating baselines.

@jgfouca
Quick fix for baseline generation
2bb921e 
The seperate small kernel testing does not need to be
(and should not) run when generating baselines.
@jgfouca jgfouca added CI: skip eamxx-all Skip all eamxx testing for this PR CI: automerge WARNING: Still in an experimental phase labels Nov 13, 2024
@jgfouca jgfouca requested a review from bartgol November 13, 2024 17:33
@mergify Mergify
Copy link
Contributor

mergify bot commented Nov 13, 2024 •
edited
Loading

Merge Protections

Your pull request matches the following merge protections and will not be merged until they are valid.

🟠 Enforce checks passing

Waiting checks: cpu-gcc / ERS_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.scream-small_kernels--scream-output-preset-5, cpu-gcc / ERS_Ln9.ne4_ne4.F2000-SCREAMv1-AQP1.scream-output-preset-2, cpu-gcc / ERS_P16_Ln22.ne30pg2_ne30pg2.FIOP-SCREAMv1-DP.scream-dpxx-arm97, cpu-gcc / SMS_D_Ln5.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.scream-mam4xx-all_mam4xx_procs, gcc-cuda / dbg, gcc-cuda / opt, gcc-cuda / sp, gcc-openmp / dbg, gcc-openmp / fpe, gcc-openmp / opt, gcc-openmp / sp.

Make sure that checks are not failing on the PR, and reviewers approved

  • any of:
    • check-skipped="gcc-openmp / dbg"
    • check-success="gcc-openmp / dbg"
  • any of:
    • check-skipped="gcc-openmp / sp"
    • check-success="gcc-openmp / sp"
  • any of:
    • check-skipped="gcc-openmp / fpe"
    • check-success="gcc-openmp / fpe"
  • any of:
    • check-skipped="gcc-openmp / opt"
    • check-success="gcc-openmp / opt"
  • any of:
    • check-skipped="gcc-cuda / dbg"
    • check-success="gcc-cuda / dbg"
  • any of:
    • check-skipped="gcc-cuda / sp"
    • check-success="gcc-cuda / sp"
  • any of:
    • check-skipped="gcc-cuda / opt"
    • check-success="gcc-cuda / opt"
  • any of:
    • check-skipped="cpu-gcc / ERS_Ln9.ne4_ne4.F2000-SCREAMv1-AQP1.scream-output-preset-2"
    • check-success="cpu-gcc / ERS_Ln9.ne4_ne4.F2000-SCREAMv1-AQP1.scream-output-preset-2"
  • any of:
    • check-skipped="cpu-gcc / ERS_P16_Ln22.ne30pg2_ne30pg2.FIOP-SCREAMv1-DP.scream-dpxx-arm97"
    • check-success="cpu-gcc / ERS_P16_Ln22.ne30pg2_ne30pg2.FIOP-SCREAMv1-DP.scream-dpxx-arm97"
  • any of:
    • check-skipped="cpu-gcc / ERS_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.scream-small_kernels--scream-output-preset-5"
    • check-success="cpu-gcc / ERS_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.scream-small_kernels--scream-output-preset-5"
  • any of:
    • check-skipped="cpu-gcc / SMS_D_Ln5.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.scream-mam4xx-all_mam4xx_procs"
    • check-success="cpu-gcc / SMS_D_Ln5.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.scream-mam4xx-all_mam4xx_procs"
  • #approved-reviews-by >= 1
  • #changes-requested-reviews-by == 0
  • any of:
    • check-skipped=cpu-gcc
    • check-success=cpu-gcc

bartgol
bartgol reviewed Nov 13, 2024
View reviewed changes
components/eamxx/src/physics/p3/tests/CMakeLists.txt
if (NOT SCREAM_P3_SMALL_KERNELS)
# If small kernels are ON, we don't need a separate executable to test them.
# Also, we never want to generate baselines with this separate executable
if (NOT SCREAM_P3_SMALL_KERNELS AND NOT SCREAM_ONLY_GENERATE_BASELINES)
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm a bit puzzled by our sk tests: they use the same tests source files...and I don't see any mention of SK in the cpp files in the tests folder. Are we just running non-SK tests twice? I think we are. Where is p3_sk_tests triggering the call of p3_sk stuff instead of "regular" p3 stuff?

Copy link
Contributor

Choose a reason for hiding this comment

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

I added printf("cloud_sed_disp!\n"); in p3_cloud_sed_impl_disp.cpp, and ran p3_sk_tests. It never printed.

@jgfouca jgfouca merged commit efde774 into master Nov 13, 2024
10 of 11 checks passed
@jgfouca jgfouca deleted the jgfouca/quick_fix_baseline_gen branch November 13, 2024 18:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bartgol bartgol bartgol approved these changes

Assignees
No one assigned
Labels
CI: automerge WARNING: Still in an experimental phase CI: skip eamxx-all Skip all eamxx testing for this PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jgfouca @bartgol