Skip to content

Split estimation declaration defaults #57

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

Merged
yoshifuminakamura merged 1 commit into from
Jun 21, 2026
Merged

Split estimation declaration defaults #57

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
21 changes: 3 additions & 18 deletions scripts/estimation/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"

Expand Down
19 changes: 19 additions & 0 deletions scripts/estimation/declarations.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
1 change: 1 addition & 0 deletions scripts/tests/test_estimation_gpu_kernel_ensemble_average.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading