From e9a335eb7c6a6949bb063d42d856331c12f2b77f Mon Sep 17 00:00:00 2001
From: Yoshifumi Nakamura <nakamura@riken.jp>
Date: Sun, 21 Jun 2026 15:27:08 +0900
Subject: [PATCH] Split estimation declaration defaults

Move bk_estimation_apply_declared_defaults out of common.sh into a dedicated declarations helper while preserving the existing public function name and common.sh import path.

Update the GPU kernel ensemble shell fixture so it copies the new helper alongside common.sh.

Signed-off-by: Yoshifumi Nakamura <nakamura@riken.jp>
---
 scripts/estimation/common.sh                  | 21 +++----------------
 scripts/estimation/declarations.sh            | 19 +++++++++++++++++
 ..._estimation_gpu_kernel_ensemble_average.sh |  1 +
 3 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 scripts/estimation/declarations.sh

diff --git a/scripts/estimation/common.sh b/scripts/estimation/common.sh
index 6624df7..53f66ad 100644
--- a/scripts/estimation/common.sh
+++ b/scripts/estimation/common.sh
@@ -9,7 +9,9 @@
 
 set -euo pipefail
 
-source "$(dirname "${BASH_SOURCE[0]}")/../result_server/api.sh"
+_bk_estimation_common_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+source "${_bk_estimation_common_dir}/../result_server/api.sh"
+source "${_bk_estimation_common_dir}/declarations.sh"
 
 # ---------------------------------------------------------------------------
 # Global variables — populated by read_values
@@ -139,23 +141,6 @@ load_reestimation_context() {
   est_reestimation_json=$(jq -c '.' "$context_file")
 }
 
-bk_estimation_apply_declared_defaults() {
-  BK_ESTIMATION_CURRENT_PACKAGE="${BK_ESTIMATION_CURRENT_PACKAGE:-${BK_ESTIMATION_DECLARED_CURRENT_PACKAGE:-}}"
-  BK_ESTIMATION_FUTURE_PACKAGE="${BK_ESTIMATION_FUTURE_PACKAGE:-${BK_ESTIMATION_DECLARED_FUTURE_PACKAGE:-}}"
-  BK_ESTIMATION_BASELINE_SYSTEM="${BK_ESTIMATION_BASELINE_SYSTEM:-${BK_ESTIMATION_DECLARED_BASELINE_SYSTEM:-}}"
-  BK_ESTIMATION_BASELINE_EXP="${BK_ESTIMATION_BASELINE_EXP:-${BK_ESTIMATION_DECLARED_BASELINE_EXP:-}}"
-  BK_ESTIMATION_FUTURE_SYSTEM="${BK_ESTIMATION_FUTURE_SYSTEM:-${BK_ESTIMATION_DECLARED_FUTURE_SYSTEM:-}}"
-  BK_ESTIMATION_CURRENT_TARGET_NODES="${BK_ESTIMATION_CURRENT_TARGET_NODES:-${BK_ESTIMATION_DECLARED_CURRENT_TARGET_NODES:-}}"
-  BK_ESTIMATION_FUTURE_TARGET_NODES="${BK_ESTIMATION_FUTURE_TARGET_NODES:-${BK_ESTIMATION_DECLARED_FUTURE_TARGET_NODES:-}}"
-  export BK_ESTIMATION_CURRENT_PACKAGE
-  export BK_ESTIMATION_FUTURE_PACKAGE
-  export BK_ESTIMATION_BASELINE_SYSTEM
-  export BK_ESTIMATION_BASELINE_EXP
-  export BK_ESTIMATION_FUTURE_SYSTEM
-  export BK_ESTIMATION_CURRENT_TARGET_NODES
-  export BK_ESTIMATION_FUTURE_TARGET_NODES
-}
-
 bk_estimation_load_package() {
   local package_name="$1"
 
diff --git a/scripts/estimation/declarations.sh b/scripts/estimation/declarations.sh
new file mode 100644
index 0000000..eecfd0a
--- /dev/null
+++ b/scripts/estimation/declarations.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# declarations.sh — Estimation declaration/default helpers.
+
+bk_estimation_apply_declared_defaults() {
+  BK_ESTIMATION_CURRENT_PACKAGE="${BK_ESTIMATION_CURRENT_PACKAGE:-${BK_ESTIMATION_DECLARED_CURRENT_PACKAGE:-}}"
+  BK_ESTIMATION_FUTURE_PACKAGE="${BK_ESTIMATION_FUTURE_PACKAGE:-${BK_ESTIMATION_DECLARED_FUTURE_PACKAGE:-}}"
+  BK_ESTIMATION_BASELINE_SYSTEM="${BK_ESTIMATION_BASELINE_SYSTEM:-${BK_ESTIMATION_DECLARED_BASELINE_SYSTEM:-}}"
+  BK_ESTIMATION_BASELINE_EXP="${BK_ESTIMATION_BASELINE_EXP:-${BK_ESTIMATION_DECLARED_BASELINE_EXP:-}}"
+  BK_ESTIMATION_FUTURE_SYSTEM="${BK_ESTIMATION_FUTURE_SYSTEM:-${BK_ESTIMATION_DECLARED_FUTURE_SYSTEM:-}}"
+  BK_ESTIMATION_CURRENT_TARGET_NODES="${BK_ESTIMATION_CURRENT_TARGET_NODES:-${BK_ESTIMATION_DECLARED_CURRENT_TARGET_NODES:-}}"
+  BK_ESTIMATION_FUTURE_TARGET_NODES="${BK_ESTIMATION_FUTURE_TARGET_NODES:-${BK_ESTIMATION_DECLARED_FUTURE_TARGET_NODES:-}}"
+  export BK_ESTIMATION_CURRENT_PACKAGE
+  export BK_ESTIMATION_FUTURE_PACKAGE
+  export BK_ESTIMATION_BASELINE_SYSTEM
+  export BK_ESTIMATION_BASELINE_EXP
+  export BK_ESTIMATION_FUTURE_SYSTEM
+  export BK_ESTIMATION_CURRENT_TARGET_NODES
+  export BK_ESTIMATION_FUTURE_TARGET_NODES
+}
diff --git a/scripts/tests/test_estimation_gpu_kernel_ensemble_average.sh b/scripts/tests/test_estimation_gpu_kernel_ensemble_average.sh
index 1ee3042..8ce228e 100644
--- a/scripts/tests/test_estimation_gpu_kernel_ensemble_average.sh
+++ b/scripts/tests/test_estimation_gpu_kernel_ensemble_average.sh
@@ -36,6 +36,7 @@ trap 'rm -rf "${TMP_DIR}"' EXIT
 
 mkdir -p "${TMP_DIR}/scripts/estimation" "${TMP_DIR}/scripts/result_server"
 cp "${REPO_DIR}/scripts/estimation/common.sh" "${TMP_DIR}/scripts/estimation/common.sh"
+cp "${REPO_DIR}/scripts/estimation/declarations.sh" "${TMP_DIR}/scripts/estimation/declarations.sh"
 cp "${REPO_DIR}/scripts/result_server/api.sh" "${TMP_DIR}/scripts/result_server/api.sh"
 cp -R "${REPO_DIR}/scripts/estimation/packages" "${TMP_DIR}/scripts/estimation/packages"
 cp -R "${REPO_DIR}/scripts/estimation/section_packages" "${TMP_DIR}/scripts/estimation/section_packages"