Skip to content

Float crepe and MORK on their default branch #1986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AdaWorldAPI merged 1 commit into from
Nov 8, 2026
Merged

Float crepe and MORK on their default branch #1986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions crates/crepe-plan-probe/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ description = "Lab spike: Crepe's rule analysis as a cold optimizer in front of

[dependencies]
# Proc macros only: `crepe_plan!` (the plan) and, in the oracle module only,
# the unmodified `crepe!` evaluator. AdaWorldAPI fork, by branch (no pins).
crepe = { git = "https://github.com/AdaWorldAPI/crepe", branch = "ccr-d3ce1263-ied9yh" }
# the unmodified `crepe!` evaluator. AdaWorldAPI fork, floating on `main`
# (internal pins are prohibited); `crepe_plan!` merged into `main` in crepe#1.
crepe = { git = "https://github.com/AdaWorldAPI/crepe", branch = "main" }
lance-graph-relalg = { path = "../lance-graph-relalg" }
lance-graph-mask-risc = { path = "../lance-graph-mask-risc" }
# The D-MPS-8 versioned relationship table (shared y domain, presence planes,
Expand Down
6 changes: 3 additions & 3 deletions crates/dir-rmap-probe/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ ogar-dir-sim = { git = "https://github.com/AdaWorldAPI/OGAR", branch = "main" }
# keeps one ndarray package.
ndarray = { git = "https://github.com/AdaWorldAPI/ndarray", branch = "master", default-features = false, features = ["std", "runtime-dispatch"] }
# Arm D, the independent oracle: crepe's generated Datalog evaluator over the
# fixture's own integer ids (never dir-sim ordinals). AdaWorldAPI fork, by
# branch (no pins), as in crepe-plan-probe.
crepe = { git = "https://github.com/AdaWorldAPI/crepe", branch = "ccr-d3ce1263-ied9yh" }
# fixture's own integer ids (never dir-sim ordinals). AdaWorldAPI fork, floating
# on `main`, as in crepe-plan-probe.
crepe = { git = "https://github.com/AdaWorldAPI/crepe", branch = "main" }
# D-RFT-1 (src/compose.rs): every count, existence and mask equality of the
# composition is an r2il procedure (`count_and`, `count`, `differ`) folded by
# mask-risc. The probe holds no counting loop of its own.
Expand Down
14 changes: 7 additions & 7 deletions crates/mork-pathmap-probe/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ default = []
leapfrog = ["mork/leapfrog"]

# Source switch: every MORK and PathMap source is named here and nowhere else.
# Pinned revisions. To swap fork <-> upstream, change these three URLs/revs;
# no source file changes.
# All three float on their default branch (internal pins are prohibited). To
# swap fork <-> upstream, change these three URLs; no source file changes.
#
# MORK: AdaWorldAPI fork, branch `ccr-9f3b8075-74u47l-stable` (`de9312e`) =
# upstream `trueagi-io/MORK` `ed57c67` + one commit that makes `nightly` a
# feature instead of a default, so it builds on stable Rust. Upstream `main`
# MORK: AdaWorldAPI fork, floating on `main` = upstream `trueagi-io/MORK`
# `ed57c67` + `de9312e` (merged in MORK#1), which makes `nightly` a feature
# instead of a default, so it builds on stable Rust. Upstream `main`
# needs nightly (`#![feature]` in fast-slice-utils).
# PathMap: AdaWorldAPI fork, floating on `master` (internal pins are
# prohibited); `ef02591` was byte-identical to upstream
# `Adam-Vandervorst/PathMap` `master` when this probe was written.
[dependencies]
mork = { git = "https://github.com/AdaWorldAPI/MORK", rev = "de9312e3" }
mork-expr = { git = "https://github.com/AdaWorldAPI/MORK", rev = "de9312e3" }
mork = { git = "https://github.com/AdaWorldAPI/MORK", branch = "main" }
mork-expr = { git = "https://github.com/AdaWorldAPI/MORK", branch = "main" }
pathmap = { git = "https://github.com/AdaWorldAPI/PathMap", branch = "master" }
# The native executor for the D-RMAP focus probe (`src/rmap.rs`): the prepared
# relationship operands are run as its programs, never re-implemented here.
Expand Down
Loading