From 2bb921e202de32c9801f389d3546bd4cbfb55e62 Mon Sep 17 00:00:00 2001 From: James Foucar Date: Wed, 13 Nov 2024 10:32:04 -0700 Subject: [PATCH] Quick fix for baseline generation The seperate small kernel testing does not need to be (and should not) run when generating baselines. --- components/eamxx/src/physics/p3/CMakeLists.txt | 2 ++ components/eamxx/src/physics/p3/tests/CMakeLists.txt | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/components/eamxx/src/physics/p3/CMakeLists.txt b/components/eamxx/src/physics/p3/CMakeLists.txt index 2a630438049..58a026e1601 100644 --- a/components/eamxx/src/physics/p3/CMakeLists.txt +++ b/components/eamxx/src/physics/p3/CMakeLists.txt @@ -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 diff --git a/components/eamxx/src/physics/p3/tests/CMakeLists.txt b/components/eamxx/src/physics/p3/tests/CMakeLists.txt index 129e3c455e2..d4fb90b1be3 100644 --- a/components/eamxx/src/physics/p3/tests/CMakeLists.txt +++ b/components/eamxx/src/physics/p3/tests/CMakeLists.txt @@ -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) CreateUnitTest(p3_sk_tests "${P3_TESTS_SRCS}" LIBS p3_sk p3_test_infra EXE_ARGS "--args ${BASELINE_FILE_ARG}"