refactor: move estimation model definitions into packages [code:qws] [system:MiyabiG]

yoshifuminakamura · yoshifuminakamura · commit 883c12d33155 · 2026-04-08T17:55:00.000+09:00
diff --git a/scripts/estimation/common.sh b/scripts/estimation/common.sh
@@ -140,6 +140,48 @@ bk_estimation_load_package() {
   BK_ESTIMATION_MODEL_VERSION="${BK_ESTIMATION_MODEL_VERSION:-${BK_ESTIMATION_PACKAGE_VERSION:-0.1}}"
 }
 
+bk_estimation_build_model_json_from_metadata() {
+  local role="$1"
+  local source_system="$2"
+  local target_system="$3"
+  local default_type="$4"
+  local default_name="$5"
+  local default_rule="$6"
+  local model_version="${7:-${BK_ESTIMATION_PACKAGE_VERSION:-0.1}}"
+  local package_metadata
+  local role_metadata
+
+  package_metadata=$(bk_estimation_package_metadata)
+  role_metadata=$(echo "$package_metadata" | jq -c --arg role "$role" '.models[$role] // {}')
+
+  jq -cn \
+    --arg type "$(echo "$role_metadata" | jq -r --arg v "$default_type" '.type // $v')" \
+    --arg name "$(echo "$role_metadata" | jq -r --arg v "$default_name" '.name // $v')" \
+    --arg version "$model_version" \
+    --arg source_system "$source_system" \
+    --arg target_system "$target_system" \
+    --arg system_compatibility_rule "$(echo "$role_metadata" | jq -r --arg v "$default_rule" '.system_compatibility_rule // $v')" \
+    --arg implementation "scripts/estimation/packages/${BK_ESTIMATION_PACKAGE}.sh" \
+    --arg role "$role" '
+    {
+      type: $type,
+      name: $name,
+      version: $version
+    }
+    + (if $source_system != "" then {source_system: $source_system} else {} end)
+    + (if $target_system != "" then {target_system: $target_system} else {} end)
+    + (if $system_compatibility_rule != "" then {system_compatibility_rule: $system_compatibility_rule} else {} end)
+    + (if $role == "top_level" then {implementation: $implementation} else {} end)
+  '
+}
+
+bk_estimation_model_name_from_metadata() {
+  local role="$1"
+  local default_name="$2"
+
+  bk_estimation_package_metadata | jq -r --arg role "$role" --arg v "$default_name" '.models[$role].name // $v'
+}
+
 bk_estimation_run_recorded_current_with_weakscaling() {
   local baseline_system="${1:-${BK_ESTIMATION_BASELINE_SYSTEM:-Fugaku}}"
   local baseline_exp="${2:-${BK_ESTIMATION_BASELINE_EXP:-CASE0}}"
@@ -168,20 +210,14 @@ bk_estimation_run_recorded_current_with_weakscaling() {
   if declare -F bk_estimation_package_build_recorded_current_model_json >/dev/null 2>&1; then
     est_current_model_json=$(bk_estimation_package_build_recorded_current_model_json "$baseline_system" "$current_model_version")
   else
-    est_current_model_json=$(jq -cn \
-      --arg type "intra_system_scaling_model" \
-      --arg name "${current_package}-current" \
-      --arg version "$current_model_version" \
-      --arg source_system "$baseline_system" \
-      --arg target_system "$baseline_system" \
-      '{
-        type: $type,
-        name: $name,
-        version: $version,
-        source_system: $source_system,
-        target_system: $target_system,
-        system_compatibility_rule: "same_system_line"
-      }')
+    est_current_model_json=$(bk_estimation_build_model_json_from_metadata \
+      "recorded_current" \
+      "$baseline_system" \
+      "$baseline_system" \
+      "intra_system_scaling_model" \
+      "${current_package}-current" \
+      "same_system_line" \
+      "$current_model_version")
   fi
 
   bk_estimation_set_current_package_metadata \
diff --git a/scripts/estimation/packages/instrumented_app_sections_dummy.sh b/scripts/estimation/packages/instrumented_app_sections_dummy.sh
@@ -55,6 +55,22 @@ bk_estimation_package_metadata() {
   "fallback_policy": {
     "mode": "allowed",
     "target": "weakscaling"
+  },
+  "models": {
+    "top_level": {
+      "type": "section-wise",
+      "name": "instrumented-app-sections-dummy"
+    },
+    "current_system": {
+      "type": "intra_system_scaling_model",
+      "name": "instrumented-app-sections-current-scaling",
+      "system_compatibility_rule": "exact_match"
+    },
+    "future_system": {
+      "type": "cross_system_projection_model",
+      "name": "instrumented-app-sections-future-projection",
+      "system_compatibility_rule": "cross_system_allowed"
+    }
   }
 }
 EOF
@@ -414,15 +430,17 @@ bk_estimation_package_run() {
   local future_system="${BK_ESTIMATION_FUTURE_SYSTEM:-FugakuNEXT}"
   local current_target_nodes="${BK_ESTIMATION_CURRENT_TARGET_NODES:-$est_node_count}"
   local future_target_nodes="${BK_ESTIMATION_FUTURE_TARGET_NODES:-$est_node_count}"
-  local model_name="${BK_ESTIMATION_MODEL_NAME:-instrumented-app-sections-dummy}"
   local model_version="${BK_ESTIMATION_MODEL_VERSION:-0.1}"
+  local model_name
   local default_section_factor="${BK_ESTIMATION_SECTION_DEFAULT_FACTOR:-0.5}"
   local logp_section_name="${BK_ESTIMATION_LOGP_SECTION_NAME:-allreduce}"
   local logp_package_name="logp"
   local breakdown_template
   local baseline_breakdown
   local applicability_issues_json
 
+  model_name=$(bk_estimation_model_name_from_metadata "top_level" "instrumented-app-sections-dummy")
+
   est_future_bench_system="$est_system"
   est_future_bench_fom="$est_fom"
   est_future_bench_nodes="$est_node_count"
@@ -497,47 +515,30 @@ bk_estimation_package_run() {
       overlap_rule: "overlap timings are scaled according to their bound overlap package"
     }')
 
-  est_model_json=$(jq -cn \
-    --arg type "section-wise" \
-    --arg name "$model_name" \
-    --arg version "$model_version" \
-    --arg implementation "scripts/estimation/packages/instrumented_app_sections_dummy.sh" \
-    '{
-      type: $type,
-      name: $name,
-      version: $version,
-      implementation: $implementation
-    }')
-  est_current_model_json=$(jq -cn \
-    --arg type "intra_system_scaling_model" \
-    --arg name "instrumented-app-sections-current-scaling" \
-    --arg version "$model_version" \
-    --arg source_system "$baseline_system" \
-    --arg target_system "$baseline_system" \
-    --arg system_compatibility_rule "exact_match" \
-    '{
-      type: $type,
-      name: $name,
-      version: $version,
-      source_system: $source_system,
-      target_system: $target_system,
-      system_compatibility_rule: $system_compatibility_rule
-    }')
-  est_future_model_json=$(jq -cn \
-    --arg type "cross_system_projection_model" \
-    --arg name "instrumented-app-sections-future-projection" \
-    --arg version "$model_version" \
-    --arg source_system "$est_system" \
-    --arg target_system "$future_system" \
-    --arg system_compatibility_rule "cross_system_allowed" \
-    '{
-      type: $type,
-      name: $name,
-      version: $version,
-      source_system: $source_system,
-      target_system: $target_system,
-      system_compatibility_rule: $system_compatibility_rule
-    }')
+  est_model_json=$(bk_estimation_build_model_json_from_metadata \
+    "top_level" \
+    "" \
+    "" \
+    "section-wise" \
+    "$model_name" \
+    "" \
+    "$model_version")
+  est_current_model_json=$(bk_estimation_build_model_json_from_metadata \
+    "current_system" \
+    "$baseline_system" \
+    "$baseline_system" \
+    "intra_system_scaling_model" \
+    "instrumented-app-sections-current-scaling" \
+    "exact_match" \
+    "$model_version")
+  est_future_model_json=$(bk_estimation_build_model_json_from_metadata \
+    "future_system" \
+    "$est_system" \
+    "$future_system" \
+    "cross_system_projection_model" \
+    "instrumented-app-sections-future-projection" \
+    "cross_system_allowed" \
+    "$model_version")
 
   est_confidence_json='{"level":"experimental","score":0.20}'
   est_notes_json=$(jq -cn \
diff --git a/scripts/estimation/packages/weakscaling.sh b/scripts/estimation/packages/weakscaling.sh
@@ -46,6 +46,27 @@ bk_estimation_package_metadata() {
   "fallback_policy": {
     "mode": "none",
     "target": null
+  },
+  "models": {
+    "top_level": {
+      "type": "section-wise",
+      "name": "weakscaling"
+    },
+    "current_system": {
+      "type": "intra_system_scaling_model",
+      "name": "weakscaling-current",
+      "system_compatibility_rule": "same_system_line"
+    },
+    "future_system": {
+      "type": "intra_system_scaling_model",
+      "name": "weakscaling-future",
+      "system_compatibility_rule": "same_system_line"
+    },
+    "recorded_current": {
+      "type": "intra_system_scaling_model",
+      "name": "weakscaling-current",
+      "system_compatibility_rule": "same_system_line"
+    }
   }
 }
 EOF
@@ -133,10 +154,12 @@ bk_estimation_package_run() {
   local future_system="${BK_ESTIMATION_FUTURE_SYSTEM:-$est_system}"
   local current_target_nodes="${BK_ESTIMATION_CURRENT_TARGET_NODES:-$est_node_count}"
   local future_target_nodes="${BK_ESTIMATION_FUTURE_TARGET_NODES:-$est_node_count}"
-  local model_name="${BK_ESTIMATION_MODEL_NAME:-weakscaling}"
   local model_version="${BK_ESTIMATION_MODEL_VERSION:-0.1}"
+  local model_name
   local applicability_issues_json
 
+  model_name=$(bk_estimation_model_name_from_metadata "top_level" "weakscaling")
+
   est_current_system="$current_system"
   est_current_target_nodes="$current_target_nodes"
   est_current_scaling_method="$model_name"
@@ -191,45 +214,30 @@ bk_estimation_package_run() {
       logp_section_rule: "sections bound to package logp are scaled with logP"
     }')
 
-  est_model_json=$(jq -cn \
-    --arg type "section-wise" \
-    --arg name "$model_name" \
-    --arg version "$model_version" \
-    --arg implementation "scripts/estimation/packages/weakscaling.sh" \
-    '{
-      type: $type,
-      name: $name,
-      version: $version,
-      implementation: $implementation
-    }')
-  est_current_model_json=$(jq -cn \
-    --arg type "intra_system_scaling_model" \
-    --arg name "weakscaling-current" \
-    --arg version "$model_version" \
-    --arg source_system "$est_system" \
-    --arg target_system "$current_system" \
-    '{
-      type: $type,
-      name: $name,
-      version: $version,
-      source_system: $source_system,
-      target_system: $target_system,
-      system_compatibility_rule: "same_system_line"
-    }')
-  est_future_model_json=$(jq -cn \
-    --arg type "intra_system_scaling_model" \
-    --arg name "weakscaling-future" \
-    --arg version "$model_version" \
-    --arg source_system "$est_system" \
-    --arg target_system "$future_system" \
-    '{
-      type: $type,
-      name: $name,
-      version: $version,
-      source_system: $source_system,
-      target_system: $target_system,
-      system_compatibility_rule: "same_system_line"
-    }')
+  est_model_json=$(bk_estimation_build_model_json_from_metadata \
+    "top_level" \
+    "" \
+    "" \
+    "section-wise" \
+    "$model_name" \
+    "" \
+    "$model_version")
+  est_current_model_json=$(bk_estimation_build_model_json_from_metadata \
+    "current_system" \
+    "$est_system" \
+    "$current_system" \
+    "intra_system_scaling_model" \
+    "weakscaling-current" \
+    "same_system_line" \
+    "$model_version")
+  est_future_model_json=$(bk_estimation_build_model_json_from_metadata \
+    "future_system" \
+    "$est_system" \
+    "$future_system" \
+    "intra_system_scaling_model" \
+    "weakscaling-future" \
+    "same_system_line" \
+    "$model_version")
 
   est_confidence_json='{"level":"experimental","score":0.30}'
   est_notes_json=$(jq -cn \
@@ -241,20 +249,14 @@ bk_estimation_package_build_recorded_current_model_json() {
   local baseline_system="$1"
   local model_version="$2"
 
-  jq -cn \
-    --arg type "intra_system_scaling_model" \
-    --arg name "weakscaling-current" \
-    --arg version "$model_version" \
-    --arg source_system "$baseline_system" \
-    --arg target_system "$baseline_system" \
-    '{
-      type: $type,
-      name: $name,
-      version: $version,
-      source_system: $source_system,
-      target_system: $target_system,
-      system_compatibility_rule: "same_system_line"
-    }'
+  bk_estimation_build_model_json_from_metadata \
+    "recorded_current" \
+    "$baseline_system" \
+    "$baseline_system" \
+    "intra_system_scaling_model" \
+    "weakscaling-current" \
+    "same_system_line" \
+    "$model_version"
 }
 
 bk_estimation_package_apply_metadata() {
