From 181a9f5e60525df9c6a16238332b10def7f212e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Feb 2025 02:53:36 +0000 Subject: [PATCH 1/3] pip prod(deps): bump marimo from 0.11.9 to 0.11.10 Bumps [marimo](https://github.com/marimo-team/marimo) from 0.11.9 to 0.11.10. - [Release notes](https://github.com/marimo-team/marimo/releases) - [Commits](https://github.com/marimo-team/marimo/compare/0.11.9...0.11.10) --- updated-dependencies: - dependency-name: marimo dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 83d46b89bf..d09fd844ba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,7 +23,7 @@ dev = [ "nbval<0.12", "filecheck==1.0.1", "lit<19.0.0", - "marimo==0.11.9", + "marimo==0.11.10", "pre-commit==4.1.0", "ruff==0.9.7", "nbconvert>=7.7.2,<8.0.0", From 4b733de59cb2ba054cfb73e61748a5399ddd4aea Mon Sep 17 00:00:00 2001 From: superlopuh Date: Thu, 27 Feb 2025 07:34:35 +0000 Subject: [PATCH 2/3] Commit from GitHub Actions (Update Lockfile Bot) --- uv.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/uv.lock b/uv.lock index f97e84d4f1..0e7e60a08c 100644 --- a/uv.lock +++ b/uv.lock @@ -1007,7 +1007,7 @@ wheels = [ [[package]] name = "marimo" -version = "0.11.9" +version = "0.11.10" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "click" }, @@ -1029,9 +1029,9 @@ dependencies = [ { name = "uvicorn" }, { name = "websockets" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/af/30/cd5a337406177c23edf4137d5f01dddf978d6905acf8e8ed1196efc7e071/marimo-0.11.9.tar.gz", hash = "sha256:14a507b75305354436221a11c1ef49d693d7d1f3e269649e748163b1d23efcfe", size = 10634420 } +sdist = { url = "https://files.pythonhosted.org/packages/03/2f/f553e584827be28a8ccf0742d503fb20e81f22a7b3e0f7d491db456dedca/marimo-0.11.10.tar.gz", hash = "sha256:cba355ad69a20bca5d064e5322946d329893e7c10ca870d9e7ce7624d3f5f2b5", size = 10638632 } wheels = [ - { url = "https://files.pythonhosted.org/packages/3c/ad/9c0b33012e5a379d364f195ef305fec600bab0d4c7f413a9474dcc290760/marimo-0.11.9-py3-none-any.whl", hash = "sha256:19a99bfd78144bd1609bfe955a52ed6617f77ecd7c667f7eb04fdd91cfe2ca63", size = 10977346 }, + { url = "https://files.pythonhosted.org/packages/73/7e/67982fdf811b3df323aedd43d7cfa51f05d4787ec06de5671e448e73d7fc/marimo-0.11.10-py3-none-any.whl", hash = "sha256:baa15897c8044b24f00541889225f1f69d97adf9b3b1262d4bc72364e224e593", size = 10982850 }, ] [[package]] @@ -2954,7 +2954,7 @@ requires-dist = [ { name = "ipykernel", marker = "extra == 'dev'" }, { name = "jax", marker = "extra == 'jax'", specifier = "==0.5.1" }, { name = "lit", marker = "extra == 'dev'", specifier = "<19.0.0" }, - { name = "marimo", marker = "extra == 'dev'", specifier = "==0.11.9" }, + { name = "marimo", marker = "extra == 'dev'", specifier = "==0.11.10" }, { name = "mkdocs", marker = "extra == 'docs'", specifier = ">=1.6.1" }, { name = "mkdocs-gen-files", marker = "extra == 'docs'", specifier = ">=0.5.0" }, { name = "mkdocs-material", marker = "extra == 'docs'", specifier = ">=9.5.49" }, From 43a39286c7a1dbcabac196f85667b0b76660941c Mon Sep 17 00:00:00 2001 From: Sasha Lopoukhine Date: Thu, 27 Feb 2025 08:02:50 +0000 Subject: [PATCH 3/3] fix notebooks --- docs/marimo/builders.py | 2 +- docs/marimo/defining_dialects.py | 10 ++-------- docs/marimo/ir_gen.py | 5 +++-- docs/marimo/linalg_snitch.py | 6 +++--- docs/marimo/mlir_ir.py | 10 +++++----- docs/marimo/pattern_rewrites.py | 14 ++++++++------ docs/marimo/rewrite_exercises.py | 5 +++-- 7 files changed, 25 insertions(+), 27 deletions(-) diff --git a/docs/marimo/builders.py b/docs/marimo/builders.py index 633879cb15..49b75cba5c 100644 --- a/docs/marimo/builders.py +++ b/docs/marimo/builders.py @@ -1,6 +1,6 @@ import marimo -__generated_with = "0.10.17" +__generated_with = "0.11.10" app = marimo.App() diff --git a/docs/marimo/defining_dialects.py b/docs/marimo/defining_dialects.py index d6cff8a808..e49a140939 100644 --- a/docs/marimo/defining_dialects.py +++ b/docs/marimo/defining_dialects.py @@ -7,7 +7,7 @@ import marimo -__generated_with = "0.11.2" +__generated_with = "0.11.10" app = marimo.App(width="medium") @@ -1065,13 +1065,7 @@ def print_ir_with_pipeline(expr: Expr): @app.cell -def _( - GreedyRewritePatternApplier, - Operation, - PatternRewriteWalker, - cse, - dce, -): +def _(GreedyRewritePatternApplier, Operation, PatternRewriteWalker, cse, dce): # Optimize the `complex` and `arith` dialects def optimize(op: Operation): # Hint: Add rewrite patterns in this list diff --git a/docs/marimo/ir_gen.py b/docs/marimo/ir_gen.py index 7d5901ccde..19db696c9f 100644 --- a/docs/marimo/ir_gen.py +++ b/docs/marimo/ir_gen.py @@ -9,7 +9,7 @@ import marimo -__generated_with = "0.11.0" +__generated_with = "0.11.10" app = marimo.App() @@ -20,7 +20,7 @@ def _(): from sympy import S, symbols, Expr, Add, Mul, Sum, Integer, Float, E, I, re, im, Abs, Pow, Rational, Function, UnevaluatedExpr from sympy.core.symbol import Symbol - from xdsl.ir import Operation, SSAValue, Region, Block, ParametrizedAttribute + from xdsl.ir import Attribute, Operation, SSAValue, Region, Block, ParametrizedAttribute from xdsl.pattern_rewriter import PatternRewriter, RewritePattern, op_type_rewrite_pattern, PatternRewriteWalker, GreedyRewritePatternApplier from xdsl.transforms.dead_code_elimination import region_dce from xdsl.traits import Pure @@ -36,6 +36,7 @@ def _(): Add, AddfOp, AddiOp, + Attribute, Block, Builder, CmpfOp, diff --git a/docs/marimo/linalg_snitch.py b/docs/marimo/linalg_snitch.py index e6cb6ae0db..4bd21b8780 100644 --- a/docs/marimo/linalg_snitch.py +++ b/docs/marimo/linalg_snitch.py @@ -1,7 +1,7 @@ import marimo -__generated_with = "0.11.2" -app = marimo.App(width="medium", auto_download=["ipynb"]) +__generated_with = "0.11.10" +app = marimo.App(width="medium") @app.cell(hide_code=True) @@ -59,11 +59,11 @@ def _(): Attribute, Block, CanonicalizePass, + Context, ConvertRiscvScfToRiscvCfPass, ConvertSnitchStreamToSnitch, ImplicitBuilder, LowerSnitchPass, - Context, MLIROptPass, MemRefType, ModuleOp, diff --git a/docs/marimo/mlir_ir.py b/docs/marimo/mlir_ir.py index d065871cb7..75775aa3eb 100644 --- a/docs/marimo/mlir_ir.py +++ b/docs/marimo/mlir_ir.py @@ -1,6 +1,6 @@ import marimo -__generated_with = "0.11.5" +__generated_with = "0.11.10" app = marimo.App(width="medium") @@ -614,8 +614,8 @@ def _(mo): @app.cell(hide_code=True) -def _(ModuleOp, Printer, StringIO): - def print_generic(module: ModuleOp) -> str: +def _(Printer, StringIO, builtin): + def print_generic(module: builtin.ModuleOp) -> str: io = StringIO() Printer(io, print_generic_format=True).print(module) return io.getvalue() @@ -663,8 +663,8 @@ def _(ctx, triangle_text): @app.cell(hide_code=True) -def _(Any, ModuleOp): - def run_func(module: ModuleOp, name: str, args: tuple[Any, ...]): +def _(Any, builtin): + def run_func(module: builtin.ModuleOp, name: str, args: tuple[Any, ...]): from xdsl.interpreter import Interpreter from xdsl.interpreters import scf, arith, func diff --git a/docs/marimo/pattern_rewrites.py b/docs/marimo/pattern_rewrites.py index 8a674d17e2..d4c178f3f1 100644 --- a/docs/marimo/pattern_rewrites.py +++ b/docs/marimo/pattern_rewrites.py @@ -7,7 +7,7 @@ import marimo -__generated_with = "0.10.17" +__generated_with = "0.11.10" app = marimo.App() @@ -24,6 +24,9 @@ def _(): from xdsl.dialects.arith import Arith from xdsl.dialects.func import Func + from xdsl.ir import Operation + + from xdsl.rewriter import Rewriter from xdsl.pattern_rewriter import ( PatternRewriter, RewritePattern, @@ -33,22 +36,23 @@ def _(): from xdsl.dialects.arith import AddiOp, ConstantOp, MuliOp from xdsl.dialects.builtin import ModuleOp from xdsl.dialects.func import FuncOp - return ( AddiOp, Arith, Builtin, ConstantOp, + Context, Func, FuncOp, GreedyRewritePatternApplier, - Context, ModuleOp, MuliOp, + Operation, Parser, PatternRewriteWalker, PatternRewriter, RewritePattern, + Rewriter, mo, xmo, ) @@ -184,7 +188,6 @@ def match_and_rewrite(self, op: Operation, rewriter: Rewriter): # last operation added, so here the `arith.addi` add = AddiOp(x, x) rewriter.replace_matched_op([add]) - return AddZeroPattern, MulTwoPattern @@ -218,12 +221,11 @@ def apply_all_rewrites(module: ModuleOp, rewrites: list[Operation]): merged_pattern = GreedyRewritePatternApplier(AddZeroPattern(), MulTwoPattern()) walker = PatternRewriteWalker(merged_pattern) walker.rewrite_module(module) - return (apply_all_rewrites,) @app.cell(hide_code=True) -def _(Arith, Builtin, Func, Context): +def _(Arith, Builtin, Context, Func): ctx = Context() ctx.load_dialect(Builtin) ctx.load_dialect(Arith) diff --git a/docs/marimo/rewrite_exercises.py b/docs/marimo/rewrite_exercises.py index 7205f7002f..55d1a25fd7 100644 --- a/docs/marimo/rewrite_exercises.py +++ b/docs/marimo/rewrite_exercises.py @@ -7,7 +7,7 @@ import marimo -__generated_with = "0.11.2" +__generated_with = "0.11.10" app = marimo.App(width="medium") @@ -35,7 +35,7 @@ def _(): ) from sympy.core.symbol import Symbol - from xdsl.ir import Operation, SSAValue, Region, Block, ParametrizedAttribute + from xdsl.ir import Attribute, Operation, SSAValue, Region, Block, ParametrizedAttribute from xdsl.pattern_rewriter import ( PatternRewriter, RewritePattern, @@ -80,6 +80,7 @@ def _(): Add, AddfOp, AddiOp, + Attribute, Block, Builder, ConstantOp,