Skip to content

Commit 5b1f003

Browse files
luisleo526claude
andcommitted
Merge engine main 1b08c61 into the EN-132 integration tree
Engine main moved while the EN-132 slice lanes were built on 9da4c98: EN-133 landed as a squash (#384), the CI time limits were removed (#378), the API docs gained the favicon (#355), and the corpus regeneration pin moved to codegen 1.5.0. Three files conflicted and are resolved: - tests/test_run_json_nonfinite_report.py takes main's version whole (the frozen producer is read from engine main 7da487a, not from a lane commit). - tests/CMakeLists.txt keeps both sides' registrations; the EN-133 test is registered once. - tests/private_fixture_reads.evidence is recomputed from the resolved file: the pinned registration line is now 3268 (and its add_test at 3288). Co-Authored-By: Claude Sonnet 5.5 <[email protected]>
2 parents 44b4d00 + 1b08c61 commit 5b1f003

67 files changed

Lines changed: 373 additions & 437 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/native-live.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ jobs:
109109
110110
- name: Verify (${{ matrix.profile }})
111111
id: verify
112-
timeout-minutes: 360
113112
run: python3 scripts/ci_verify.py ${{ matrix.profile }} --build-dir ${{ matrix.build_dir }} --jobs "$(getconf _NPROCESSORS_ONLN)" --generator Ninja --curl-dir "${{ steps.curl-deps.outputs.curl-dir }}" --ccache ${{ matrix.profile == 'native' && '--require-websocket' || '' }} ${{ matrix.profile == 'native' && inputs.exclude_slow && '--exclude-label slow' || '' }}
114113

115114
- name: Stage and summarize diagnostics
@@ -154,4 +153,7 @@ jobs:
154153
PROFILES_RESULT: ${{ needs.native-live.result }}
155154
run: |
156155
printf 'native profiles: %s\n' "$PROFILES_RESULT"
156+
if test "$PROFILES_RESULT" = cancelled; then
157+
printf 'HANG (re-run): a native profile job was cancelled, which is how the platform stops a job at its 360-minute maximum\n'
158+
fi
157159
test "$PROFILES_RESULT" = success

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ What each gate refuses:
159159

160160
`ci_verify.py` counts the CTest rows that actually **ran** and fails below a
161161
floor. The floors' numbers live in one place, the
162-
`PRIVATE_FIXTURE_PROFILE_FLOORS` ci_verify.py:794 table: per profile, `full`
162+
`PRIVATE_FIXTURE_PROFILE_FLOORS` ci_verify.py:789 table: per profile, `full`
163163
is its overlay-present registered population and `pinned` is how many rows of
164164
`tests/private_fixture_rows.txt` that registry registers, so with the private
165165
fixtures absent the floor is `full` minus `pinned`; every other profile

‎benchmarks/speed/aggregate.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def _sysctl_or(key: str, fallback: str) -> str:
7070
if sys.platform != "darwin":
7171
return fallback
7272
try:
73-
r = subprocess.run(["sysctl", "-n", key], capture_output=True, text=True, timeout=5)
73+
r = subprocess.run(["sysctl", "-n", key], capture_output=True, text=True)
7474
val = r.stdout.strip()
7575
return val if val else fallback
7676
except Exception:

‎benchmarks/tests/test_run_all.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def run_all(self, **env: str) -> subprocess.CompletedProcess:
112112
return subprocess.run(
113113
["bash", str(self.root / "benchmarks" / "run_all.sh")],
114114
env={**os.environ, **QUIET, "PATH": path, "JOBS": "2", **env},
115-
capture_output=True, text=True, timeout=120)
115+
capture_output=True, text=True)
116116

117117
def assert_output(self, slot: Path, csv: str, content: str | None) -> None:
118118
path = slot / csv

‎corpus‎

Submodule corpus updated 313 files

‎docker/run_json_provenance_test.py‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ def run(label, inputs=None, overrides=None, failure_option=None):
7171
if values is not None:
7272
command += ["-e", f"PINEFORGE_{name}={json.dumps(values)}"]
7373
command.append(image)
74-
process = subprocess.run(command, capture_output=True, text=True,
75-
timeout=180)
74+
process = subprocess.run(command, capture_output=True, text=True)
7675
(artifacts / f"{label}.command.json").write_text(json.dumps(command))
7776
(artifacts / f"{label}.stdout.json").write_text(process.stdout)
7877
(artifacts / f"{label}.stderr.log").write_text(process.stderr)
@@ -274,7 +273,7 @@ def check(name, condition, value):
274273
"--mount", f"type=bind,src={compiled},dst=/proof",
275274
"-e", "PINEFORGE_INPUTS=" + json.dumps(inputs),
276275
"-e", "PINEFORGE_OVERRIDES=" + json.dumps(settings), image]
277-
result = subprocess.run(command, capture_output=True, text=True, timeout=180)
276+
result = subprocess.run(command, capture_output=True, text=True)
278277
case = artifacts / label
279278
(case / "command.json").write_text(json.dumps(command))
280279
(case / "stdout.json").write_text(result.stdout)
@@ -400,7 +399,7 @@ def legacy(path):
400399
"--mount", f"type=bind,src={source},dst=/in,readonly",
401400
"--mount", f"type=bind,src={compiled},dst=/proof",
402401
"-e", "PINEFORGE_INPUTS=" + json.dumps(inputs), image]
403-
result = subprocess.run(command, capture_output=True, text=True, timeout=180)
402+
result = subprocess.run(command, capture_output=True, text=True)
404403
(case / "command.json").write_text(json.dumps(command))
405404
(case / "stdout.json").write_text(result.stdout)
406405
(case / "stderr.log").write_text(result.stderr)
@@ -562,7 +561,7 @@ def check(name, condition, value):
562561
"--mount", f"type=bind,src={Path(__file__).resolve()},dst=/probe.py,readonly",
563562
"--entrypoint", "python3", image, "/probe.py",
564563
"--producer-unicode" if unicode_only else "--producer-classes"]
565-
oracle = subprocess.run(oracle_command, capture_output=True, text=True, timeout=120)
564+
oracle = subprocess.run(oracle_command, capture_output=True, text=True)
566565
(artifacts / "producer.command.json").write_text(json.dumps(oracle_command))
567566
(artifacts / "producer.stdout.json").write_text(oracle.stdout)
568567
(artifacts / "producer.stderr.log").write_text(oracle.stderr)
@@ -589,7 +588,7 @@ def check(name, condition, value):
589588
"--mount", f"type=bind,src={source},dst=/in,readonly",
590589
"--mount", f"type=bind,src={compiled},dst=/proof",
591590
"-e", "PINEFORGE_INPUTS=" + json.dumps(inputs), image]
592-
result = subprocess.run(command, capture_output=True, text=True, timeout=180)
591+
result = subprocess.run(command, capture_output=True, text=True)
593592
(case / "command.json").write_text(json.dumps(command))
594593
(case / "stdout.json").write_text(result.stdout)
595594
(case / "stderr.log").write_text(result.stderr)
@@ -657,7 +656,7 @@ def check(name, condition, value):
657656
"--mount", f"type=bind,src={source},dst=/in,readonly",
658657
"--mount", f"type=bind,src={compiled},dst=/proof",
659658
"-e", "PINEFORGE_INPUTS=" + json.dumps(inputs), image]
660-
result = subprocess.run(command, capture_output=True, text=True, timeout=180)
659+
result = subprocess.run(command, capture_output=True, text=True)
661660
(case / "command.json").write_text(json.dumps(command))
662661
(case / "stdout.json").write_text(result.stdout)
663662
(case / "stderr.log").write_text(result.stderr)
@@ -671,7 +670,7 @@ def check(name, condition, value):
671670
"--mount", f"type=bind,src={Path(__file__).resolve()},dst=/probe.py,readonly",
672671
"--mount", f"type=bind,src={compiled},dst=/proof,readonly",
673672
"--entrypoint", "python3", image, "/probe.py", "--native-receipt", "/proof/" + plugin.name]
674-
observed = subprocess.run(observe, capture_output=True, text=True, timeout=60)
673+
observed = subprocess.run(observe, capture_output=True, text=True)
675674
(case / "native.command.json").write_text(json.dumps(observe))
676675
(case / "native.stdout.json").write_text(observed.stdout)
677676
(case / "native.stderr.log").write_text(observed.stderr)
@@ -741,7 +740,7 @@ def check(name, condition, value):
741740
command = ["docker", "run", "--rm", "--network", "none",
742741
"--mount", f"type=bind,src={source},dst=/in,readonly",
743742
"-e", "PINEFORGE_TRANSPILE_ONLY=1", image]
744-
emitted = subprocess.run(command, capture_output=True, text=True, timeout=180)
743+
emitted = subprocess.run(command, capture_output=True, text=True)
745744
(artifacts / "strategy.pine").write_text(ALLOWLIST_STRATEGY, encoding="utf-8")
746745
(artifacts / "transpile.command.json").write_text(json.dumps(command))
747746
(artifacts / "transpile.cpp").write_text(emitted.stdout, encoding="utf-8")
@@ -823,7 +822,7 @@ def once(text, old, new):
823822
"--mount", f"type=bind,src={cpp_dir},dst=/in,readonly",
824823
"--mount", f"type=bind,src={compiled},dst=/proof",
825824
"-e", "PINEFORGE_INPUTS=" + json.dumps(inputs), image]
826-
result = subprocess.run(command, capture_output=True, text=True, timeout=240)
825+
result = subprocess.run(command, capture_output=True, text=True)
827826
(case / "command.json").write_text(json.dumps(command))
828827
(case / "stdout.json").write_text(result.stdout)
829828
(case / "stderr.log").write_text(result.stderr)
@@ -841,7 +840,7 @@ def once(text, old, new):
841840
"--mount", f"type=bind,src={compiled},dst=/proof,readonly",
842841
"--entrypoint", "python3", image, "/probe.py", "--allowlist-native",
843842
"/proof/" + plugin.name, json.dumps(inputs)]
844-
observed = subprocess.run(observe, capture_output=True, text=True, timeout=60)
843+
observed = subprocess.run(observe, capture_output=True, text=True)
845844
(case / "native.command.json").write_text(json.dumps(observe))
846845
(case / "native.stdout.json").write_text(observed.stdout)
847846
(case / "native.stderr.log").write_text(observed.stderr)
@@ -974,7 +973,7 @@ def check(name, condition, detail):
974973
(source / "strategy.pine").write_text(STRATEGY)
975974
command = ["docker", "run", "--rm", "--network", "none", "--mount",
976975
f"type=bind,src={source},dst=/in,readonly", "-e", "PINEFORGE_TRANSPILE_ONLY=1", image]
977-
emitted = subprocess.run(command, capture_output=True, text=True, timeout=180)
976+
emitted = subprocess.run(command, capture_output=True, text=True)
978977
(artifacts / "transpile.command.json").write_text(json.dumps(command))
979978
(artifacts / "transpile.cpp").write_text(emitted.stdout)
980979
(artifacts / "transpile.stderr.log").write_text(emitted.stderr)
@@ -1023,7 +1022,7 @@ def method(body):
10231022
f"type=bind,src={inputs_dir},dst=/in,readonly", "--mount",
10241023
f"type=bind,src={compiled},dst=/proof", "-e", "PINEFORGE_INPUTS=" + json.dumps(inputs),
10251024
"-e", "PINEFORGE_OVERRIDES=" + json.dumps(overrides), image]
1026-
result = subprocess.run(command, capture_output=True, text=True, timeout=240)
1025+
result = subprocess.run(command, capture_output=True, text=True)
10271026
for suffix, data in (("command.json", json.dumps(command)), ("stdout.json", result.stdout),
10281027
("stderr.log", result.stderr), ("exit", str(result.returncode))):
10291028
(case / suffix).write_text(data)

‎docs/Doxyfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
PROJECT_NAME = "PineForge"
1010
PROJECT_BRIEF = "Deterministic PineScript v6 backtest runtime — C ABI reference"
1111
PROJECT_LOGO =
12+
PROJECT_ICON = _theme/favicon.ico
1213
PROJECT_NUMBER = # filled in by docs/build.sh: git describe, else VERSION
1314

1415
OUTPUT_DIRECTORY = site

‎docs/_theme/favicon.ico‎

718 Bytes
Binary file not shown.

‎docs/adr/0001-kernel-adapter-boundary.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ citations, 264 are in `src/source/` and its headers; 6 sit in kernel files
450450
and checks its own numbers before it prints its summary line. `PINEFORGE_BUILD_EXAMPLES`
451451
(`CMakeLists.txt:37`, default OFF) builds them (`add_subdirectory` `CMakeLists.txt:386`) and
452452
registers each as a CTest row that runs through `examples/native/run_example.cmake`, which
453-
fails on a nonzero exit, a signal, a timeout **or** a missing summary line — so a row asserts
453+
fails on a nonzero exit, a signal **or** a missing summary line — so a row asserts
454454
both, which a bare `PASS_REGULAR_EXPRESSION` cannot. `scripts/test_example_runner.py` proves
455455
the runner fails in each of those ways and that no `example_*` row sets a property that would
456456
override its verdict. Each example is compiled `-UNDEBUG`, so an `assert()` in one aborts its

0 commit comments

Comments
 (0)