Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- "3.10"
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@1.71.1
- uses: dtolnay/rust-toolchain@1.79.0
- uses: Swatinem/rust-cache@v2
- name: Setup python ${{ matrix.py }}
uses: actions/setup-python@v5
Expand All @@ -38,7 +38,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@1.71.1
- uses: dtolnay/rust-toolchain@1.79.0
- uses: Swatinem/rust-cache@v2
- uses: actions/setup-python@v5
with:
Expand All @@ -51,7 +51,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@1.71.1
- uses: dtolnay/rust-toolchain@1.79.0
- uses: Swatinem/rust-cache@v2
- uses: actions/setup-python@v5
with:
Expand All @@ -66,7 +66,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@1.71.1
- uses: dtolnay/rust-toolchain@1.79.0
- uses: Swatinem/rust-cache@v2
- uses: actions/setup-python@v5
with:
Expand Down
110 changes: 66 additions & 44 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 8 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,24 @@ name = "egglog"
crate-type = ["cdylib"]

[dependencies]
pyo3 = { version = "0.21", features = ["extension-module"] }
pyo3 = { version = "0.22.5", features = ["extension-module"] }

# https://github.com/egraphs-good/egglog/compare/ceed816e9369570ffed9feeba157b19471dda70d...main
# egglog = { git = "https://github.com/egraphs-good/egglog", rev = "fb4a9f114f9bb93154d6eff0dbab079b5cb4ebb6" }
egglog = { git = "https://github.com/egraphs-good/egglog", rev = "b0db06832264c9b22694bd3de2bdacd55bbe9e32" }
# egglog = { path = "../egg-smol" }
# egglog = { git = "https://github.com/oflatt/egg-smol", branch = "oflatt-fast-terms" }
egglog = { git = "https://github.com/saulshanabrook/egg-smol", rev = "a555b2f5e82c684442775cc1a5da94b71930113c" }
egraph-serialize = { git = "https://github.com/saulshanabrook/egraph-serialize", rev = "1c205fcc6d3426800b828e9264dbadbd4a5ef6e9", features = [
"serde",
"graphviz",
] }
# egglog = { git = "https://github.com/saulshanabrook/egg-smol", rev = "a555b2f5e82c684442775cc1a5da94b71930113c" }
egraph-serialize = { version = "0.2.0", features = ["serde", "graphviz"] }
# egraph-serialize = { path = "../egraph-serialize", features = [
# "serde",
# "graphviz",
# ] }
serde_json = "*"
pyo3-log = "0.10.0"
serde_json = "1.0.1"
pyo3-log = "0.11.0"
log = "0.4.21"
lalrpop-util = { version = "0.20.2", features = ["lexer"] }
ordered-float = "*"
lalrpop-util = { version = "0.20", features = ["lexer"] }
ordered-float = "3.7"
uuid = { version = "1.8.0", features = ["v4"] }
num-rational = "*"

# Use unreleased version of egraph-serialize in egglog as well
# [patch.crates-io]
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,7 @@ python/egglog/visualizer.js python/egglog/visualizer.css: visualizer.tgz

clean:
rm -rf package python/egglog/visualizer.css python/egglog/visualizer.js visualizer.tgz

from-local:
cp ../egraph-visualizer/dist/index.js python/egglog/visualizer.js
cp ../egraph-visualizer/dist/style.css python/egglog/visualizer.css
2 changes: 2 additions & 0 deletions docs/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ _This project uses semantic versioning_

## UNRELEASED

- Upgrade dependencies including [egglog](https://github.com/egraphs-good/egglog/compare/saulshanabrook:egg-smol:a555b2f5e82c684442775cc1a5da94b71930113c...b0db06832264c9b22694bd3de2bdacd55bbe9e32)

## 8.0.0 (2024-10-17)

- Adds ability to use anonymous functions where callables are needed. These are automatically transformed to egglog
Expand Down
4 changes: 2 additions & 2 deletions docs/how-to-guides.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ file_format: mystnb

## Parsing and running program strings

You can provide your program in a special DSL language. You can parse this with {meth}`egglog.bindings.EGraph.parse_program` and then run the result with You can parse this with {meth}`egglog.bindings.EGraph.run_program`::
You can provide your program in a special DSL language. You can parse this with {meth}`egglog.bindings.parse_program` and then run the result with You can parse this with {meth}`egglog.bindings.EGraph.run_program`::

```{code-cell}
from egglog.bindings import EGraph

egraph = EGraph()
commands = egraph.parse_program("(check (= (+ 1 2) 3))")
commands = parse_program("(check (= (+ 1 2) 3))")
commands
```

Expand Down
Loading
Loading