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

Quick fix for baseline generation #3107

Merged
merged 1 commit into from
Nov 13, 2024
+5 −1
Merged

Quick fix for baseline generation #3107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions components/eamxx/src/physics/p3/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ if (SCREAM_P3_SMALL_KERNELS)
add_library(p3 ${P3_SRCS} ${P3_SK_SRCS})
else()
add_library(p3 ${P3_SRCS})
# 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_LIBS_ONLY AND NOT SCREAM_ONLY_GENERATE_BASELINES)
add_library(p3_sk ${P3_SRCS} ${P3_SK_SRCS})
# Always build p3_sk with SCREAM_P3_SMALL_KERNELS on
Expand Down
4 changes: 3 additions & 1 deletion components/eamxx/src/physics/p3/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ if (SCREAM_ENABLE_BASELINE_TESTS)
${FORCE_RUN_DIFF_FAILS})
endif()

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.

CreateUnitTest(p3_sk_tests "${P3_TESTS_SRCS}"
LIBS p3_sk p3_test_infra
EXE_ARGS "--args ${BASELINE_FILE_ARG}"
Expand Down