fmq/DCTS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(all): NaN 伪收敛否决与 nl_tight 能量回退、emflux 检验 4π 修正、nst 行宽与种子边界修复、gfATO 谱线表接通与网格加密 9216 点、阶段分项统计与跳板机部署

Browse Source 
物理修复（400 失败点归因，见 docs/failed400_nan_pseudo_convergence_2026_08_17.md）：
- runner: 阶段 converged 后复查 fort.7，含 NaN/Inf 即否决（fort.9 全零伪收敛，
  曾致 261 点误跳过 nl_direct 回退）；否决阶段不产出种子，阻断污染传播
- runner: nl_tight 回退——仅能量边际失败时以 CHMAX 收紧 10× 从自身模型续迭代，
  残差降幅 ~10×；execute_tlusty_stage 抽取供主链与回退共用
- conv_check: fort.14 为 Eddington 通量 Hλ，积分需乘 4π 再比 σTeff⁴
  （旧版 ratio 稳定 0.0796=1/4π，全点系统性假阳性）+ 回归测试
- nst_writer: 单行超 80 字符被 TLUSTY 静默截断，IFALI/JALI/TRAD 等从未生效；
  按 75 字符自动换行
- seed_finder: Teff 容忍度改含边界 <=，相邻 5000K 档恢复互为种子 + 回归测试

谱线表与网格：
- 默认线表 gfVIS99 → gfATO（全波段 18-23000Å），TaskSpec.linelist 支持工作流
  级覆盖，节点按需下载（进程互斥锁防并发重复下载 238MB）
- sdB_cno Teff 加密至 5000K 步长，432 → 9216 点；tlusty/synspec 静态二进制更新

统计与部署：
- grid 汇总改按 tlusty_status/synspec_status 分项计数，新增 tlusty_failed/
  synspec_failed/synspec_pending，前端详情页双视图适配
- deploy/fetch_results 支持跳板机 ProxyJump 与 SSH 主连接复用，fetch 新增 --force；
- Docker 构建支持 CARGO_MIRROR/USE_MIRRORS 国内镜像参数；移除 tools/ 拷贝
- 新增 tlusty-synspec-test skill 与 6 篇根因分析/验证文档
This commit is contained in:
fmq
2026-08-17 23:55:26 +08:00
parent 43b82b1ae2
commit b058e66722
54 changed files with 5624 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/server/src/api/status.rs
+2 -1
View File
@@ -34,7 +34,8 @@ pub async fn get_status(
.await
.unwrap_or(serde_json::json!({
"total": 0, "pending": 0, "queued": 0, "running": 0, "completed": 0, "failed": 0,
"cold_run_converged": 0, "seed_step_converged": 0, "synspec_converged": 0
"cold_run_converged": 0, "seed_step_converged": 0, "tlusty_failed": 0,
"synspec_converged": 0, "synspec_failed": 0, "synspec_pending": 0
}));
Ok(Json(json!({
crates/server/src/db/grid.rs
+26 -8
View File
@@ -576,14 +576,17 @@ impl Database {
SUM(CASE WHEN status = 'running' THEN 1 ELSE 0 END) AS running,
SUM(CASE WHEN status = 'completed' THEN 1 ELSE 0 END) AS completed,
SUM(CASE WHEN status = 'failed' THEN 1 ELSE 0 END) AS failed,
SUM(CASE WHEN status = 'completed' AND tlusty_success_method = 'cold_run' THEN 1 ELSE 0 END) AS cold_run_converged,
SUM(CASE WHEN status = 'completed' AND tlusty_success_method = 'seed_step' THEN 1 ELSE 0 END) AS seed_step_converged,
SUM(CASE WHEN status = 'completed' AND synspec_success_method IS NOT NULL THEN 1 ELSE 0 END) AS synspec_converged
SUM(CASE WHEN tlusty_status = 'converged' AND tlusty_success_method = 'cold_run' THEN 1 ELSE 0 END) AS cold_run_converged,
SUM(CASE WHEN tlusty_status = 'converged' AND tlusty_success_method = 'seed_step' THEN 1 ELSE 0 END) AS seed_step_converged,
SUM(CASE WHEN tlusty_status = 'failed' THEN 1 ELSE 0 END) AS tlusty_failed,
SUM(CASE WHEN synspec_status = 'converged' THEN 1 ELSE 0 END) AS synspec_converged,
SUM(CASE WHEN synspec_status = 'failed' THEN 1 ELSE 0 END) AS synspec_failed,
SUM(CASE WHEN synspec_status = 'pending' THEN 1 ELSE 0 END) AS synspec_pending
FROM grid_points WHERE workflow_name = ?1",
params![name],
|r| {
let n = |i: usize| -> i64 { r.get::<_, Option<i64>>(i).unwrap_or(None).unwrap_or(0) };
Ok((n(0), n(1), n(2), n(3), n(4), n(5), n(6), n(7), n(8)))
Ok((n(0), n(1), n(2), n(3), n(4), n(5), n(6), n(7), n(8), n(9), n(10), n(11)))
},
),
None => conn.query_row(
@@ -594,14 +597,17 @@ impl Database {
SUM(CASE WHEN status = 'running' THEN 1 ELSE 0 END) AS running,
SUM(CASE WHEN status = 'completed' THEN 1 ELSE 0 END) AS completed,
SUM(CASE WHEN status = 'failed' THEN 1 ELSE 0 END) AS failed,
SUM(CASE WHEN status = 'completed' AND tlusty_success_method = 'cold_run' THEN 1 ELSE 0 END) AS cold_run_converged,
SUM(CASE WHEN status = 'completed' AND tlusty_success_method = 'seed_step' THEN 1 ELSE 0 END) AS seed_step_converged,
SUM(CASE WHEN status = 'completed' AND synspec_success_method IS NOT NULL THEN 1 ELSE 0 END) AS synspec_converged
SUM(CASE WHEN tlusty_status = 'converged' AND tlusty_success_method = 'cold_run' THEN 1 ELSE 0 END) AS cold_run_converged,
SUM(CASE WHEN tlusty_status = 'converged' AND tlusty_success_method = 'seed_step' THEN 1 ELSE 0 END) AS seed_step_converged,
SUM(CASE WHEN tlusty_status = 'failed' THEN 1 ELSE 0 END) AS tlusty_failed,
SUM(CASE WHEN synspec_status = 'converged' THEN 1 ELSE 0 END) AS synspec_converged,
SUM(CASE WHEN synspec_status = 'failed' THEN 1 ELSE 0 END) AS synspec_failed,
SUM(CASE WHEN synspec_status = 'pending' THEN 1 ELSE 0 END) AS synspec_pending
FROM grid_points",
[],
|r| {
let n = |i: usize| -> i64 { r.get::<_, Option<i64>>(i).unwrap_or(None).unwrap_or(0) };
Ok((n(0), n(1), n(2), n(3), n(4), n(5), n(6), n(7), n(8)))
Ok((n(0), n(1), n(2), n(3), n(4), n(5), n(6), n(7), n(8), n(9), n(10), n(11)))
},
),
}?;
@@ -614,7 +620,10 @@ impl Database {
failed,
cold_run_converged,
seed_step_converged,
tlusty_failed,
synspec_converged,
synspec_failed,
synspec_pending,
) = row;
Ok(serde_json::json!({
@@ -626,7 +635,10 @@ impl Database {
"failed": failed,
"cold_run_converged": cold_run_converged,
"seed_step_converged": seed_step_converged,
"tlusty_failed": tlusty_failed,
"synspec_converged": synspec_converged,
"synspec_failed": synspec_failed,
"synspec_pending": synspec_pending,
}))
})
.await?
@@ -721,6 +733,10 @@ impl Database {
failed,
cold_run_converged: g("cold_run_converged"),
seed_step_converged: g("seed_step_converged"),
tlusty_failed: g("tlusty_failed"),
synspec_converged: g("synspec_converged"),
synspec_failed: g("synspec_failed"),
synspec_pending: g("synspec_pending"),
waves,
avg_point_sec,
eta_sec,
@@ -828,6 +844,7 @@ impl Database {
COALESCE(t.elapsed_sec, gp.last_elapsed_sec) AS eff_elapsed,
gp.workflow_name,
gp.synspec_success_method,
gp.tlusty_status, gp.synspec_status,
ROW_NUMBER() OVER (
PARTITION BY gp.name, gp.workflow_name
ORDER BY t.completed_at IS NULL, t.completed_at DESC, t.created_at DESC
@@ -872,6 +889,7 @@ impl Database {
COALESCE(t.elapsed_sec, gp.last_elapsed_sec) AS eff_elapsed,
gp.workflow_name,
gp.synspec_success_method,
gp.tlusty_status, gp.synspec_status,
ROW_NUMBER() OVER (
PARTITION BY gp.name, gp.workflow_name
ORDER BY t.completed_at IS NULL, t.completed_at DESC, t.created_at DESC
crates/server/src/db/mod.rs
+30 -1
View File
@@ -699,6 +699,9 @@ pub struct WorkflowSummary {
}
/// 工作流列表内联的网格统计（单条 GROUP BY 聚合回填，无 N+1）。
///
/// 阶段分项计数（TLUSTY/SYNSPEC 双视图）：前端按选中阶段切换展示，每阶段独立统计，
/// 不再混用整体 status。`tlusty_*` 基于 `tlusty_status` 列，`synspec_*` 基于 `synspec_status` 列。
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
pub struct WorkflowListStats {
pub total: i64,
@@ -707,8 +710,14 @@ pub struct WorkflowListStats {
pub running: i64,
pub cold_run_converged: i64,
pub seed_step_converged: i64,
/// 光谱收敛点数（synspec_success_method 非 NULL；Phase 5a 落库）。
/// TLUSTY 阶段发散点数（tlusty_status='failed'）。
pub tlusty_failed: i64,
/// SYNSPEC 阶段收敛点数（synspec_status='converged'）。
pub synspec_converged: i64,
/// SYNSPEC 阶段失败点数（synspec_status='failed'）。
pub synspec_failed: i64,
/// SYNSPEC 阶段未运行（synspec_status='pending'，多为 tlusty 未收敛而阻塞）。
pub synspec_pending: i64,
}
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
@@ -731,6 +740,8 @@ pub struct WaveStats {
}
/// 单工作流执行统计（详情页数据源）。
///
/// 阶段分项计数（TLUSTY/SYNSPEC 双视图）：前端按选中阶段切换展示。
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
pub struct WorkflowStats {
pub name: String,
@@ -743,6 +754,14 @@ pub struct WorkflowStats {
pub failed: i64,
pub cold_run_converged: i64,
pub seed_step_converged: i64,
/// TLUSTY 阶段发散点数（tlusty_status='failed'）。
pub tlusty_failed: i64,
/// SYNSPEC 阶段收敛点数（synspec_status='converged'）。
pub synspec_converged: i64,
/// SYNSPEC 阶段失败点数（synspec_status='failed'）。
pub synspec_failed: i64,
/// SYNSPEC 阶段未运行（synspec_status='pending'）。
pub synspec_pending: i64,
pub waves: Vec<WaveStats>,
/// 近似单点平均墙钟耗时（秒，含排队等待，仅参考）；无历史数据为 None。
pub avg_point_sec: Option<f64>,
@@ -772,6 +791,13 @@ pub struct PointRow {
pub tlusty_success_method: Option<String>,
/// 光谱阶段收敛策略（synspec 以何策略收敛；TLUSTY-only 为 NULL）。
pub synspec_success_method: Option<String>,
/// TLUSTY 阶段状态（'converged'/'failed'/'pending'/NULL）。
/// 独立于整体 status——半失败点（大气收敛+光谱失败）此处为 'converged' 而 status='failed'。
#[serde(default)]
pub tlusty_status: Option<String>,
/// SYNSPEC 阶段状态（'converged'/'failed'/'pending'/NULL）。
#[serde(default)]
pub synspec_status: Option<String>,
pub attempt_count: i32,
/// 最近尝试的收敛指标（最大相对修正）。
pub last_max_relc: Option<f64>,
@@ -807,6 +833,8 @@ fn point_row_from_query(r: &rusqlite::Row<'_>) -> rusqlite::Result<PointRow> {
last_error: r.get(16)?,
last_elapsed_sec: r.get(17)?,
synspec_success_method: r.get(19)?,
tlusty_status: r.get(20)?,
synspec_status: r.get(21)?,
})
}
@@ -1824,6 +1852,7 @@ mod tests {
convergence_min_ratio: None,
bfac_max: None,
bfac_min: None,
linelist: None,
};
let syn_task = Uuid::new_v4();
let old_task = Uuid::new_v4();
crates/server/src/db/workflows.rs
+10 -4
View File
@@ -96,9 +96,12 @@ impl Database {
SUM(CASE WHEN status = 'completed' THEN 1 ELSE 0 END) AS completed,
SUM(CASE WHEN status = 'failed' THEN 1 ELSE 0 END) AS failed,
SUM(CASE WHEN status = 'running' THEN 1 ELSE 0 END) AS running,
SUM(CASE WHEN status = 'completed' AND tlusty_success_method = 'cold_run' THEN 1 ELSE 0 END) AS cold,
SUM(CASE WHEN status = 'completed' AND tlusty_success_method = 'seed_step' THEN 1 ELSE 0 END) AS seed,
SUM(CASE WHEN status = 'completed' AND synspec_success_method IS NOT NULL THEN 1 ELSE 0 END) AS synspec
SUM(CASE WHEN tlusty_status = 'converged' AND tlusty_success_method = 'cold_run' THEN 1 ELSE 0 END) AS cold,
SUM(CASE WHEN tlusty_status = 'converged' AND tlusty_success_method = 'seed_step' THEN 1 ELSE 0 END) AS seed,
SUM(CASE WHEN tlusty_status = 'failed' THEN 1 ELSE 0 END) AS tlusty_failed,
SUM(CASE WHEN synspec_status = 'converged' THEN 1 ELSE 0 END) AS synspec_converged,
SUM(CASE WHEN synspec_status = 'failed' THEN 1 ELSE 0 END) AS synspec_failed,
SUM(CASE WHEN synspec_status = 'pending' THEN 1 ELSE 0 END) AS synspec_pending
FROM grid_points GROUP BY workflow_name",
)?;
let agg_rows = agg_stmt.query_map([], |r| {
@@ -111,7 +114,10 @@ impl Database {
running: r.get::<_, Option<i64>>(4)?.unwrap_or(0),
cold_run_converged: r.get::<_, Option<i64>>(5)?.unwrap_or(0),
seed_step_converged: r.get::<_, Option<i64>>(6)?.unwrap_or(0),
synspec_converged: r.get::<_, Option<i64>>(7)?.unwrap_or(0),
tlusty_failed: r.get::<_, Option<i64>>(7)?.unwrap_or(0),
synspec_converged: r.get::<_, Option<i64>>(8)?.unwrap_or(0),
synspec_failed: r.get::<_, Option<i64>>(9)?.unwrap_or(0),
synspec_pending: r.get::<_, Option<i64>>(10)?.unwrap_or(0),
},
))
})?;
crates/server/src/scheduler.rs
+13
View File
@@ -299,6 +299,14 @@ impl GridScheduler {
.and_then(|t| serde_json::to_value(t).ok())
}
/// 读取工作流 YAML 的 `linelist` 字段（SYNSPEC 谱线表文件名，如 "gfATO.dat"）。
/// None → node 端用默认线表（embedded.rs 启动时下载的 default_linelist）。
async fn get_workflow_linelist(&self, workflow_name: &str) -> Option<String> {
let wf = self.db.get_workflow(workflow_name).await.ok()??;
let cfg = parse_grid_config_or_warn(&wf.config_yaml, workflow_name, "linelist")?;
cfg.linelist.clone()
}
/// 一次性读取工作流的全部物理校验阈值（能量守恒 / 温度结构 / emflux）。
/// 统一读取避免对同一 YAML 多次解析。返回 8 元组，对应 TaskSpec 的 8 个标量字段：
/// (energy_tolerance, temp_max_factor, temp_floor, temp_ceiling, emflux_tolerance,
@@ -451,6 +459,7 @@ impl GridScheduler {
let tlusty_chain = self.get_workflow_tlusty_chain(workflow_name).await;
let seed_chain = self.get_workflow_seed_chain(workflow_name).await;
let tlusty_input = self.get_workflow_tlusty_input(workflow_name).await;
let linelist = self.get_workflow_linelist(workflow_name).await;
let (
energy_tolerance,
temp_max_factor,
@@ -615,6 +624,7 @@ impl GridScheduler {
convergence_min_ratio,
bfac_max,
bfac_min,
linelist: linelist.clone(),
};
self.db.insert_task(&task_spec).await?;
@@ -904,6 +914,7 @@ impl GridScheduler {
let tlusty_chain = self.get_workflow_tlusty_chain(workflow_name).await;
let seed_chain = self.get_workflow_seed_chain(workflow_name).await;
let tlusty_input = self.get_workflow_tlusty_input(workflow_name).await;
let linelist = self.get_workflow_linelist(workflow_name).await;
let (
energy_tolerance,
temp_max_factor,
@@ -968,6 +979,7 @@ impl GridScheduler {
convergence_min_ratio: None,
bfac_max: None,
bfac_min: None,
linelist: linelist.clone(),
};
self.db.insert_task(&task_spec).await?;
self.db
@@ -1062,6 +1074,7 @@ impl GridScheduler {
convergence_min_ratio,
bfac_max,
bfac_min,
linelist: linelist.clone(),
};
self.db.insert_task(&task_spec).await?;