Update external worker audit for FEMLite 0.6.4
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
build*/
|
||||
output/
|
||||
*.o
|
||||
*.obj
|
||||
*.mod
|
||||
|
||||
+5
-2
@@ -1,6 +1,6 @@
|
||||
cmake_minimum_required(VERSION 3.20)
|
||||
|
||||
project(CCLite VERSION 0.1.7 LANGUAGES C Fortran)
|
||||
project(CCLite VERSION 0.1.9 LANGUAGES C Fortran)
|
||||
|
||||
set(CMAKE_Fortran_STANDARD 2018)
|
||||
set(CMAKE_Fortran_STANDARD_REQUIRED ON)
|
||||
@@ -144,13 +144,16 @@ if(Python3_Interpreter_FOUND)
|
||||
"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}")
|
||||
set(CCLITE_FEMLITE_AUDIT_CASE "${CMAKE_SOURCE_DIR}/FEMLite/examples/c3d4_one_element.inp" CACHE FILEPATH
|
||||
"Optional FEMLite case for worker mock audit")
|
||||
if(EXISTS "${CCLITE_SPHLITE_EXE}" AND EXISTS "${CCLITE_FEMLITE_EXE}" AND EXISTS "${CCLITE_FEMLITE_AUDIT_CASE}")
|
||||
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
|
||||
--fem-case ${CCLITE_FEMLITE_AUDIT_CASE}
|
||||
--report ${CMAKE_BINARY_DIR}/output/real_worker_gap_report.json
|
||||
)
|
||||
endif()
|
||||
|
||||
@@ -6,8 +6,29 @@ import subprocess
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
def run_worker_probe(exe: Path, solver_id: str, case_file: Path) -> dict:
|
||||
command = [
|
||||
def run_command(command: list[str]) -> dict:
|
||||
try:
|
||||
completed = subprocess.run(command, text=True, capture_output=True, timeout=10.0)
|
||||
except subprocess.TimeoutExpired as exc:
|
||||
return {
|
||||
"command": command,
|
||||
"exit_code": None,
|
||||
"stdout": exc.stdout or "",
|
||||
"stderr": exc.stderr or "",
|
||||
"status": "TIMEOUT",
|
||||
}
|
||||
|
||||
return {
|
||||
"command": command,
|
||||
"exit_code": completed.returncode,
|
||||
"stdout": completed.stdout,
|
||||
"stderr": completed.stderr,
|
||||
"status": "RAW",
|
||||
}
|
||||
|
||||
|
||||
def run_standard_worker_probe(exe: Path, solver_id: str, case_file: Path) -> dict:
|
||||
result = run_command([
|
||||
str(exe),
|
||||
"--cclite-worker",
|
||||
"--solver-id",
|
||||
@@ -18,41 +39,52 @@ def run_worker_probe(exe: Path, solver_id: str, case_file: Path) -> dict:
|
||||
"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 "")
|
||||
])
|
||||
output = (result.get("stdout") or "") + "\n" + (result.get("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,
|
||||
}
|
||||
result["status"] = classify_standard_probe(recognized, unsupported, result["exit_code"])
|
||||
result["recognized_worker_cli"] = recognized
|
||||
result["ipc_implemented"] = recognized and result["exit_code"] == 0 and not unsupported
|
||||
return result
|
||||
|
||||
|
||||
def classify_probe(recognized: bool, unsupported: bool, exit_code: int) -> str:
|
||||
def run_femlite_mock_probe(exe: Path, case_file: Path, report_path: Path) -> dict:
|
||||
output_dir = report_path.parent / "femlite_worker_mock"
|
||||
log_file = report_path.parent / "femlite_worker_mock.log"
|
||||
result = run_command([
|
||||
str(exe),
|
||||
"--cclite-worker",
|
||||
"--case",
|
||||
str(case_file),
|
||||
"--ipc-name",
|
||||
"CCLITE_FEMLITE_WORKER_MOCK_AUDIT",
|
||||
"--log",
|
||||
str(log_file),
|
||||
"--output-dir",
|
||||
str(output_dir),
|
||||
"--mock-steps",
|
||||
"1",
|
||||
])
|
||||
output = (result.get("stdout") or "") + "\n" + (result.get("stderr") or "")
|
||||
if result["exit_code"] == 0 and "worker mock completed" in output.lower():
|
||||
result["status"] = "WORKER_MOCK_AVAILABLE"
|
||||
elif "unknown worker argument" in output.lower() or "unknown argument" in output.lower():
|
||||
result["status"] = "MISSING_WORKER_MOCK_CLI"
|
||||
else:
|
||||
result["status"] = "WORKER_MOCK_FAILED"
|
||||
result["log_file"] = str(log_file)
|
||||
result["output_dir"] = str(output_dir)
|
||||
return result
|
||||
|
||||
|
||||
def classify_standard_probe(recognized: bool, unsupported: bool, exit_code: int | None) -> str:
|
||||
if recognized and unsupported:
|
||||
return "CONTROLLED_UNSUPPORTED"
|
||||
if recognized and exit_code == 0:
|
||||
return "READY_FOR_HANDSHAKE"
|
||||
return "READY_FOR_REAL_IPC"
|
||||
if not recognized:
|
||||
return "MISSING_WORKER_CLI"
|
||||
return "MISSING_STANDARD_WORKER_ARGS"
|
||||
return "FAILED"
|
||||
|
||||
|
||||
@@ -61,14 +93,24 @@ def main() -> int:
|
||||
parser.add_argument("--sph-exe", required=True)
|
||||
parser.add_argument("--fem-exe", required=True)
|
||||
parser.add_argument("--case-dir", required=True)
|
||||
parser.add_argument("--fem-case", 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_path = Path(args.report)
|
||||
sph_standard = run_standard_worker_probe(Path(args.sph_exe), "SPH", case_dir / "mock_sph.inp")
|
||||
fem_standard = run_standard_worker_probe(Path(args.fem_exe), "FEM", Path(args.fem_case))
|
||||
fem_mock = run_femlite_mock_probe(Path(args.fem_exe), Path(args.fem_case), report_path)
|
||||
|
||||
status = "PARTIAL_EXTERNAL_WORKER_SUPPORT"
|
||||
if sph_standard["ipc_implemented"] and fem_standard["ipc_implemented"]:
|
||||
status = "READY_FOR_REAL_IPC"
|
||||
elif fem_mock["status"] != "WORKER_MOCK_AVAILABLE":
|
||||
status = "CONTROLLED_GAP"
|
||||
|
||||
report = {
|
||||
"status": "CONTROLLED_GAP",
|
||||
"status": status,
|
||||
"required_worker_args": [
|
||||
"--cclite-worker",
|
||||
"--solver-id <SPH|FEM>",
|
||||
@@ -76,16 +118,17 @@ def main() -> int:
|
||||
"--ipc-name <prefix>",
|
||||
"--timeout-ms <milliseconds>",
|
||||
],
|
||||
"sphlite": sph,
|
||||
"femlite": fem,
|
||||
"sphlite_standard_ipc": sph_standard,
|
||||
"femlite_standard_ipc": fem_standard,
|
||||
"femlite_worker_mock": fem_mock,
|
||||
"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.",
|
||||
"FEMLite 0.6.4 provides a self-running CCLite worker mock.",
|
||||
"FEMLite 0.6.4 does not yet accept the full CCLite standard IPC worker argument set.",
|
||||
"CCLite 0.1.9 keeps mock-worker IPC 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}")
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
7. 1 step 与 100 step 空耦合集成测试;
|
||||
8. `run.log`、`ipc_report.csv`、`force_balance.csv`;
|
||||
9. Python checker 生成 `verification_report.json`;
|
||||
10. 真实 SPHLite/FEMLite worker 接入审计和受控缺口报告。
|
||||
10. 真实 SPHLite/FEMLite worker 接入审计和分层能力报告。
|
||||
|
||||
## 3. 验证结果
|
||||
|
||||
@@ -25,16 +25,17 @@
|
||||
2. `V010_EMPTY_COUPLING` checker 输出 `PASS`;
|
||||
3. UTF-8 without BOM 检查通过;
|
||||
4. 干净构建目录重建和测试通过;
|
||||
5. 真实 worker audit 输出 `CONTROLLED_GAP`。
|
||||
5. 真实 worker audit 输出 SPHLite 标准 IPC 状态、FEMLite 标准 IPC 状态和 FEMLite worker mock 状态。
|
||||
|
||||
## 4. 真实 worker 状态
|
||||
|
||||
当前本地审计结果:
|
||||
|
||||
1. SPHLite 0.8.2 能识别 worker CLI,但真实 Windows IPC 返回受控 unsupported;
|
||||
2. FEMLite 0.6.3 尚未识别 CCLite worker 参数;
|
||||
3. 0.1.x 的可执行验收路径仍是 CCLite mock worker;
|
||||
4. 0.2.x 前必须先在 SPHLite/FEMLite 侧补齐 worker adapter。
|
||||
2. FEMLite 0.6.4 已提供自运行 worker mock,可完成 1 step mock 闭环;
|
||||
3. FEMLite 0.6.4 尚未接受 CCLite 标准 IPC worker 参数中的 `--solver-id` 和 `--timeout-ms`;
|
||||
4. 0.1.x 的可执行验收路径仍是 CCLite mock worker;
|
||||
5. 0.2.x 前必须先在 SPHLite/FEMLite 侧补齐真实 IPC worker adapter。
|
||||
|
||||
## 5. 进入 0.2.x 的条件
|
||||
|
||||
|
||||
@@ -2,14 +2,15 @@
|
||||
|
||||
## 1. 审计结论
|
||||
|
||||
CCLite 0.1.7 已固化真实 worker/service 的启动参数,并完成对当前本地 SPHLite/FEMLite 可执行程序的只读审计。
|
||||
CCLite 0.1.9 已固化真实 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. FEMLite 0.6.4 已提供自运行的 CCLite worker mock,可用 `--case`、`--ipc-name`、`--log`、`--output-dir` 和 `--mock-steps` 完成 worker mock 闭环。
|
||||
3. FEMLite 0.6.4 尚未接受 CCLite 0.1.x 标准 IPC worker 参数中的 `--solver-id` 和 `--timeout-ms`,主程序也尚未切换为真实跨进程 Windows IPC worker 主循环。
|
||||
4. CCLite 0.1.9 的工程验收路径仍采用内置 mock worker 完成 1 step 与 100 step 空耦合闭环。
|
||||
5. 真实 IPC worker 不在 0.1.9 中伪装为已接入;后续必须在 SPHLite/FEMLite 侧补齐真实 IPC worker adapter 后再进入真实联调。
|
||||
|
||||
## 2. CCLite 固化的 worker 参数
|
||||
|
||||
@@ -29,7 +30,7 @@ CCLite 0.1.7 已固化真实 worker/service 的启动参数,并完成对当前
|
||||
| `--ipc-name` | CCLite 分配的 IPC 名称前缀 |
|
||||
| `--timeout-ms` | worker 等待命令的超时时间 |
|
||||
|
||||
CCLite 0.1.7 mock worker 同时兼容旧的 `--ipc-prefix` 和 `--solver-input`,但正式参数以 `--ipc-name` 和 `--case` 为准。
|
||||
CCLite mock worker 同时兼容旧的 `--ipc-prefix` 和 `--solver-input`,但正式参数以 `--ipc-name` 和 `--case` 为准。
|
||||
|
||||
## 3. 当前真实 worker 审计结果
|
||||
|
||||
@@ -39,7 +40,7 @@ CCLite 0.1.7 mock worker 同时兼容旧的 `--ipc-prefix` 和 `--solver-input`
|
||||
build-codex-gcc/output/real_worker_gap_report.json
|
||||
```
|
||||
|
||||
SPHLite 当前行为:
|
||||
SPHLite 标准 IPC worker 探测:
|
||||
|
||||
```text
|
||||
worker_state: ERROR
|
||||
@@ -47,10 +48,16 @@ solver_id: SPH
|
||||
error_message: CCLite worker IPC is not implemented yet
|
||||
```
|
||||
|
||||
FEMLite 当前行为:
|
||||
FEMLite 标准 IPC worker 探测:
|
||||
|
||||
```text
|
||||
unknown argument: --solver-id
|
||||
unknown worker argument: --solver-id
|
||||
```
|
||||
|
||||
FEMLite worker mock 探测:
|
||||
|
||||
```text
|
||||
CCLite worker mock completed
|
||||
```
|
||||
|
||||
## 4. 后续接入条件
|
||||
@@ -66,22 +73,23 @@ SPHLite 进入真实空耦合前必须完成:
|
||||
|
||||
FEMLite 进入真实空耦合前必须完成:
|
||||
|
||||
1. 增加 `--cclite-worker` CLI;
|
||||
2. 支持与 SPHLite 相同的 worker 参数集合;
|
||||
1. 保留当前 `--cclite-worker` worker mock;
|
||||
2. 支持与 CCLite 标准 IPC worker 一致的 `--solver-id` 和 `--timeout-ms` 参数;
|
||||
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 验收口径
|
||||
## 5. 0.1.9 验收口径
|
||||
|
||||
0.1.7 不声明真实 SPHLite/FEMLite worker 已接入。
|
||||
0.1.9 不声明真实 SPHLite/FEMLite IPC worker 已接入。
|
||||
|
||||
0.1.7 完成以下工程目标:
|
||||
0.1.9 完成以下工程目标:
|
||||
|
||||
1. CCLite 主控的 worker 参数已固化;
|
||||
2. mock worker 使用同一参数集合;
|
||||
3. 真实 SPHLite/FEMLite 可执行程序审计可自动生成受控缺口报告;
|
||||
4. 若本地缺少 SPHLite/FEMLite 包,审计测试不会阻塞 CCLite 自身构建;
|
||||
5. 0.1.x 通信闭环仍由 CCLite mock worker 验收。
|
||||
3. 真实 SPHLite/FEMLite 可执行程序审计可自动生成分层能力报告;
|
||||
4. FEMLite worker mock 可用时,审计报告显示 `WORKER_MOCK_AVAILABLE`;
|
||||
5. 若本地缺少 SPHLite/FEMLite 包,审计测试不会阻塞 CCLite 自身构建;
|
||||
6. 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 = 8
|
||||
character(len=*), parameter :: CCL_VERSION_LABEL = "0.1.8"
|
||||
integer, parameter :: CCL_VERSION_PATCH = 9
|
||||
character(len=*), parameter :: CCL_VERSION_LABEL = "0.1.9"
|
||||
|
||||
contains
|
||||
|
||||
|
||||
Reference in New Issue
Block a user