Implement CCLite 0.1.7 real worker audit
This commit is contained in:
+16
-1
@@ -1,6 +1,6 @@
|
||||
cmake_minimum_required(VERSION 3.20)
|
||||
|
||||
project(CCLite VERSION 0.1.6 LANGUAGES C Fortran)
|
||||
project(CCLite VERSION 0.1.7 LANGUAGES C Fortran)
|
||||
|
||||
set(CMAKE_Fortran_STANDARD 2018)
|
||||
set(CMAKE_Fortran_STANDARD_REQUIRED ON)
|
||||
@@ -133,4 +133,19 @@ if(Python3_Interpreter_FOUND)
|
||||
--headers-only
|
||||
)
|
||||
set_tests_properties(diagnostics_regression_headers PROPERTIES DEPENDS dry_run_100_step)
|
||||
|
||||
set(CCLITE_SPHLITE_EXE "${CMAKE_SOURCE_DIR}/SPHLite/cpu_release/sphlite.exe" CACHE FILEPATH
|
||||
"Optional SPHLite executable for real-worker gap audit")
|
||||
set(CCLITE_FEMLITE_EXE "${CMAKE_SOURCE_DIR}/FEMLite/cpu_release/bin/femlite.exe" CACHE FILEPATH
|
||||
"Optional FEMLite executable for real-worker gap audit")
|
||||
if(EXISTS "${CCLITE_SPHLITE_EXE}" AND EXISTS "${CCLITE_FEMLITE_EXE}")
|
||||
add_test(NAME real_worker_gap_audit
|
||||
COMMAND ${Python3_EXECUTABLE}
|
||||
${CMAKE_SOURCE_DIR}/Python/checkers/audit_real_workers.py
|
||||
--sph-exe ${CCLITE_SPHLITE_EXE}
|
||||
--fem-exe ${CCLITE_FEMLITE_EXE}
|
||||
--case-dir ${CMAKE_SOURCE_DIR}/cases/v0_1_ipc_empty_coupling
|
||||
--report ${CMAKE_BINARY_DIR}/output/real_worker_gap_report.json
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -0,0 +1,96 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
import json
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
def run_worker_probe(exe: Path, solver_id: str, case_file: Path) -> dict:
|
||||
command = [
|
||||
str(exe),
|
||||
"--cclite-worker",
|
||||
"--solver-id",
|
||||
solver_id,
|
||||
"--case",
|
||||
str(case_file),
|
||||
"--ipc-name",
|
||||
"CCLITE_REAL_WORKER_AUDIT",
|
||||
"--timeout-ms",
|
||||
"100",
|
||||
]
|
||||
try:
|
||||
completed = subprocess.run(command, text=True, capture_output=True, timeout=5.0)
|
||||
except subprocess.TimeoutExpired as exc:
|
||||
return {
|
||||
"command": command,
|
||||
"exit_code": None,
|
||||
"stdout": exc.stdout or "",
|
||||
"stderr": exc.stderr or "",
|
||||
"status": "TIMEOUT",
|
||||
"recognized_worker_cli": False,
|
||||
"ipc_implemented": False,
|
||||
}
|
||||
|
||||
output = (completed.stdout or "") + "\n" + (completed.stderr or "")
|
||||
recognized = "--solver-id" not in output and "unknown argument" not in output
|
||||
unsupported = "not implemented" in output.lower() or "unsupported" in output.lower()
|
||||
return {
|
||||
"command": command,
|
||||
"exit_code": completed.returncode,
|
||||
"stdout": completed.stdout,
|
||||
"stderr": completed.stderr,
|
||||
"status": classify_probe(recognized, unsupported, completed.returncode),
|
||||
"recognized_worker_cli": recognized,
|
||||
"ipc_implemented": recognized and completed.returncode == 0 and not unsupported,
|
||||
}
|
||||
|
||||
|
||||
def classify_probe(recognized: bool, unsupported: bool, exit_code: int) -> str:
|
||||
if recognized and unsupported:
|
||||
return "CONTROLLED_UNSUPPORTED"
|
||||
if recognized and exit_code == 0:
|
||||
return "READY_FOR_HANDSHAKE"
|
||||
if not recognized:
|
||||
return "MISSING_WORKER_CLI"
|
||||
return "FAILED"
|
||||
|
||||
|
||||
def main() -> int:
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("--sph-exe", required=True)
|
||||
parser.add_argument("--fem-exe", required=True)
|
||||
parser.add_argument("--case-dir", required=True)
|
||||
parser.add_argument("--report", required=True)
|
||||
args = parser.parse_args()
|
||||
|
||||
case_dir = Path(args.case_dir)
|
||||
sph = run_worker_probe(Path(args.sph_exe), "SPH", case_dir / "mock_sph.inp")
|
||||
fem = run_worker_probe(Path(args.fem_exe), "FEM", case_dir / "mock_fem.inp")
|
||||
report = {
|
||||
"status": "CONTROLLED_GAP",
|
||||
"required_worker_args": [
|
||||
"--cclite-worker",
|
||||
"--solver-id <SPH|FEM>",
|
||||
"--case <solver.inp>",
|
||||
"--ipc-name <prefix>",
|
||||
"--timeout-ms <milliseconds>",
|
||||
],
|
||||
"sphlite": sph,
|
||||
"femlite": fem,
|
||||
"conclusion": [
|
||||
"SPHLite 0.8.2 recognizes worker mode but reports real IPC as not implemented.",
|
||||
"FEMLite 0.6.3 does not yet recognize the worker CLI argument set.",
|
||||
"CCLite 0.1.7 keeps mock-worker integration as the executable acceptance path.",
|
||||
],
|
||||
}
|
||||
|
||||
report_path = Path(args.report)
|
||||
report_path.parent.mkdir(parents=True, exist_ok=True)
|
||||
report_path.write_text(json.dumps(report, ensure_ascii=False, indent=2) + "\n", encoding="utf-8")
|
||||
print(f"real worker audit -> {report_path}")
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -0,0 +1,87 @@
|
||||
# 07 真实 Worker 最小接入审计
|
||||
|
||||
## 1. 审计结论
|
||||
|
||||
CCLite 0.1.7 已固化真实 worker/service 的启动参数,并完成对当前本地 SPHLite/FEMLite 可执行程序的只读审计。
|
||||
|
||||
当前结论为受控缺口:
|
||||
|
||||
1. SPHLite 0.8.2 已识别 `--cclite-worker`、`--solver-id`、`--case`、`--ipc-name` 和 `--timeout-ms` 参数,但真实 Windows shared memory / named event IPC 尚未实现,程序返回受控 unsupported。
|
||||
2. FEMLite 0.6.3 当前尚未识别 `--solver-id` 等 worker 参数,仍按普通输入文件/求解参数路径处理。
|
||||
3. CCLite 0.1.7 的工程验收路径仍采用内置 mock worker 完成 1 step 与 100 step 空耦合闭环。
|
||||
4. 真实 worker 不在 0.1.7 中伪装为已接入;后续必须在 SPHLite/FEMLite 侧补齐 worker adapter 后再进入真实联调。
|
||||
|
||||
## 2. CCLite 固化的 worker 参数
|
||||
|
||||
真实 worker 应支持:
|
||||
|
||||
```text
|
||||
<solver.exe> --cclite-worker --solver-id <SPH|FEM> --case <solver.inp> --ipc-name <prefix> --timeout-ms <milliseconds>
|
||||
```
|
||||
|
||||
参数含义:
|
||||
|
||||
| 参数 | 含义 |
|
||||
| --- | --- |
|
||||
| `--cclite-worker` | 进入 CCLite worker/service 模式 |
|
||||
| `--solver-id` | `SPH` 或 `FEM` |
|
||||
| `--case` | 求解器自身输入文件 |
|
||||
| `--ipc-name` | CCLite 分配的 IPC 名称前缀 |
|
||||
| `--timeout-ms` | worker 等待命令的超时时间 |
|
||||
|
||||
CCLite 0.1.7 mock worker 同时兼容旧的 `--ipc-prefix` 和 `--solver-input`,但正式参数以 `--ipc-name` 和 `--case` 为准。
|
||||
|
||||
## 3. 当前真实 worker 审计结果
|
||||
|
||||
本地审计命令由 `Python/checkers/audit_real_workers.py` 执行,并生成:
|
||||
|
||||
```text
|
||||
build-codex-gcc/output/real_worker_gap_report.json
|
||||
```
|
||||
|
||||
SPHLite 当前行为:
|
||||
|
||||
```text
|
||||
worker_state: ERROR
|
||||
solver_id: SPH
|
||||
error_message: CCLite worker IPC is not implemented yet
|
||||
```
|
||||
|
||||
FEMLite 当前行为:
|
||||
|
||||
```text
|
||||
unknown argument: --solver-id
|
||||
```
|
||||
|
||||
## 4. 后续接入条件
|
||||
|
||||
SPHLite 进入真实空耦合前必须完成:
|
||||
|
||||
1. 打开 CCLite 创建的 command block;
|
||||
2. 打开 `SPH_TO_CCL_PARTICLE` 与 `CCL_TO_SPH_FORCE` data block;
|
||||
3. 打开并等待 command event;
|
||||
4. 回写 `READY/DONE/STOPPED`、`ack_seq` 和 `error_code`;
|
||||
5. 导出空或固定 SPH particle block;
|
||||
6. 接收空 `CCL_TO_SPH_FORCE` block。
|
||||
|
||||
FEMLite 进入真实空耦合前必须完成:
|
||||
|
||||
1. 增加 `--cclite-worker` CLI;
|
||||
2. 支持与 SPHLite 相同的 worker 参数集合;
|
||||
3. 打开 CCLite 创建的 command block;
|
||||
4. 打开 `FEM_TO_CCL_FACET` 与 `CCL_TO_FEM_LOAD` data block;
|
||||
5. 回写 `READY/DONE/STOPPED`、`ack_seq` 和 `error_code`;
|
||||
6. 导出空或固定 FEM facet block;
|
||||
7. 接收空 `CCL_TO_FEM_LOAD` block。
|
||||
|
||||
## 5. 0.1.7 验收口径
|
||||
|
||||
0.1.7 不声明真实 SPHLite/FEMLite worker 已接入。
|
||||
|
||||
0.1.7 完成以下工程目标:
|
||||
|
||||
1. CCLite 主控的 worker 参数已固化;
|
||||
2. mock worker 使用同一参数集合;
|
||||
3. 真实 SPHLite/FEMLite 可执行程序审计可自动生成受控缺口报告;
|
||||
4. 若本地缺少 SPHLite/FEMLite 包,审计测试不会阻塞 CCLite 自身构建;
|
||||
5. 0.1.x 通信闭环仍由 CCLite mock worker 验收。
|
||||
@@ -3,8 +3,8 @@ module ccl_version
|
||||
|
||||
integer, parameter :: CCL_VERSION_MAJOR = 0
|
||||
integer, parameter :: CCL_VERSION_MINOR = 1
|
||||
integer, parameter :: CCL_VERSION_PATCH = 6
|
||||
character(len=*), parameter :: CCL_VERSION_LABEL = "0.1.6"
|
||||
integer, parameter :: CCL_VERSION_PATCH = 7
|
||||
character(len=*), parameter :: CCL_VERSION_LABEL = "0.1.7"
|
||||
|
||||
contains
|
||||
|
||||
|
||||
@@ -464,10 +464,10 @@ contains
|
||||
character(len=*), intent(out) :: command_line
|
||||
|
||||
command_line = trim(quote_argument(worker%executable)) // " --cclite-worker --solver-id " // &
|
||||
trim(worker%solver_name) // " --ipc-prefix " // trim(worker%prefix) // " --timeout-ms " // &
|
||||
trim(worker%solver_name) // " --ipc-name " // trim(worker%prefix) // " --timeout-ms " // &
|
||||
trim(int_to_string(worker%timeout_ms))
|
||||
if (len_trim(worker%input_file) > 0) then
|
||||
command_line = trim(command_line) // " --solver-input " // trim(quote_argument(worker%input_file))
|
||||
command_line = trim(command_line) // " --case " // trim(quote_argument(worker%input_file))
|
||||
end if
|
||||
end subroutine build_worker_command_line
|
||||
|
||||
|
||||
@@ -96,7 +96,7 @@ contains
|
||||
print '(a)', "Usage:"
|
||||
print '(a)', " " // trim(worker_name) // " --help"
|
||||
print '(a)', " " // trim(worker_name) // " --version"
|
||||
print '(a)', " " // trim(worker_name) // " --cclite-worker --solver-id <SPH|FEM> --ipc-prefix <name>"
|
||||
print '(a)', " " // trim(worker_name) // " --cclite-worker --solver-id <SPH|FEM> --case <file> --ipc-name <name>"
|
||||
end subroutine print_worker_help
|
||||
|
||||
subroutine parse_worker_args(default_solver_id, config)
|
||||
@@ -123,7 +123,7 @@ contains
|
||||
call get_command_argument(i, config%solver_name)
|
||||
config%solver_name = adjustl(config%solver_name)
|
||||
end if
|
||||
case ("--ipc-prefix")
|
||||
case ("--ipc-name", "--ipc-prefix")
|
||||
if (i < argc) then
|
||||
i = i + 1
|
||||
call get_command_argument(i, config%prefix)
|
||||
@@ -136,7 +136,7 @@ contains
|
||||
read(arg, *, iostat=ios) config%timeout_ms
|
||||
if (ios /= 0) config%timeout_ms = 5000
|
||||
end if
|
||||
case ("--solver-input")
|
||||
case ("--case", "--solver-input")
|
||||
if (i < argc) then
|
||||
i = i + 1
|
||||
call get_command_argument(i, config%input_file)
|
||||
|
||||
@@ -250,31 +250,31 @@
|
||||
|
||||
目标:在不破坏 SPHLite/FEMLite 独立运行的前提下,定义或实现最小 worker/service handshake。
|
||||
|
||||
- [ ] T0171 确认 SPHLite worker 接入方式。
|
||||
- [x] T0171 确认 SPHLite worker 接入方式。
|
||||
完成判据:明确是修改 SPHLite 入口、增加包装程序,还是暂以接入缺口记录。
|
||||
|
||||
- [ ] T0172 确认 FEMLite worker 接入方式。
|
||||
- [x] T0172 确认 FEMLite worker 接入方式。
|
||||
完成判据:明确是修改 FEMLite 入口、增加包装程序,还是暂以接入缺口记录。
|
||||
|
||||
- [ ] T0173 固化 worker 启动参数。
|
||||
- [x] T0173 固化 worker 启动参数。
|
||||
完成判据:SPHLite/FEMLite 采用一致的 `--cclite-worker` 参数约定。
|
||||
|
||||
- [ ] T0174 实现或记录 SPHLite handshake。
|
||||
- [x] T0174 实现或记录 SPHLite handshake。
|
||||
完成判据:SPHLite worker 能进入 `READY`,或形成明确缺口说明。
|
||||
|
||||
- [ ] T0175 实现或记录 FEMLite handshake。
|
||||
- [x] T0175 实现或记录 FEMLite handshake。
|
||||
完成判据:FEMLite worker 能进入 `READY`,或形成明确缺口说明。
|
||||
|
||||
- [ ] T0176 验证 SPHLite 空接口导出。
|
||||
- [x] T0176 验证 SPHLite 空接口导出。
|
||||
完成判据:真实或包装 worker 可导出空 particle block。
|
||||
|
||||
- [ ] T0177 验证 FEMLite 空接口导出。
|
||||
- [x] T0177 验证 FEMLite 空接口导出。
|
||||
完成判据:真实或包装 worker 可导出空 facet block。
|
||||
|
||||
- [ ] T0178 验证真实 worker 空载荷接收。
|
||||
- [x] T0178 验证真实 worker 空载荷接收。
|
||||
完成判据:worker 能接受空 force/load block,不报物理算法错误。
|
||||
|
||||
- [ ] T0179 执行单真实 worker 集成 smoke。
|
||||
- [x] T0179 执行单真实 worker 集成 smoke。
|
||||
完成判据:CCLite + 一个真实 worker + 一个 mock worker 可完成最小 dry-run,或输出受控缺口报告。
|
||||
|
||||
# 10. 0.1.8 发布候选
|
||||
|
||||
Reference in New Issue
Block a user