Skip to content

Commit 49234bb

Browse files
JulianGCalderonJulianGCalderon
committed
Merge branch 'main' into review_todo
2 parents b8d6b01 + b23b0c3 commit 49234bb

39 files changed

+577
-165
lines changed

‎.github/workflows/daily.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,7 @@ jobs:
199199
continue-on-error: true
200200

201201
- name: Compare states
202-
run: |
203-
./scripts/cmp_state_dumps.sh | tee output
202+
run: python ./scripts/cmp_state_dumps.py | tee output
204203

205204
- name: Upload Compare Results
206205
id: upload_compare_results

‎.github/workflows/starknet-blocks.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
with:
3333
repository: lambdaclass/starknet-replay
3434
path: starknet-replay
35-
ref: 135ba7cd5b45fe137b11b7f75654dcd472363033
35+
ref: 1b8e2e0be21a8df9f5f6b8f8514d1a40b456ef58
3636
# We need native to use the linux deps ci action
3737
- name: Checkout Native
3838
uses: actions/checkout@v4
@@ -43,7 +43,7 @@ jobs:
4343
with:
4444
repository: lambdaclass/sequencer
4545
path: sequencer
46-
ref: b61262980394dab0e0a4c4cab85f12d31d0ce878
46+
ref: 40331042c1149f5cb84b27f9dd8d47994a010bbe
4747

4848
- name: Cache RPC Calls
4949
uses: actions/[email protected]
@@ -126,5 +126,4 @@ jobs:
126126
continue-on-error: true
127127

128128
- name: Compare states
129-
run: |
130-
./scripts/cmp_state_dumps.sh
129+
run: python ./scripts/cmp_state_dumps.py

‎Cargo.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cairo-native"
3-
version = "0.5.0-rc.5"
3+
version = "0.5.0-rc.6"
44
edition = "2021"
55
license = "Apache-2.0"
66
description = "A compiler to convert Cairo's IR Sierra code to MLIR and execute it."

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ often so use it at your own risk. 🚧
4141

4242
For versions under `1.0` `cargo` doesn't comply with
4343
[semver](https://semver.org/), so we advise to pin the version you
44-
use. This can be done by adding `cairo-native = "0.5.0-rc.5"` to your Cargo.toml
44+
use. This can be done by adding `cairo-native = "0.5.0-rc.6"` to your Cargo.toml
4545

4646
## Getting Started
4747

‎benches/compile_time.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub fn bench_compile_time(c: &mut Criterion) {
1515
b.iter(|| {
1616
let native_context = NativeContext::new();
1717
native_context
18-
.compile(program, false, Some(Default::default()))
18+
.compile(program, false, Some(Default::default()), None)
1919
.unwrap();
2020
// pass manager internally verifies the MLIR output is correct.
2121
})
@@ -32,7 +32,7 @@ pub fn bench_compile_time(c: &mut Criterion) {
3232
c.bench_with_input(BenchmarkId::new(filename, 1), &program, |b, program| {
3333
b.iter(|| {
3434
native_context
35-
.compile(program, false, Some(Default::default()))
35+
.compile(program, false, Some(Default::default()), None)
3636
.unwrap();
3737
// pass manager internally verifies the MLIR output is correct.
3838
})
@@ -48,9 +48,9 @@ pub fn bench_compile_time(c: &mut Criterion) {
4848
b.iter(|| {
4949
let native_context = NativeContext::new();
5050
let module = native_context
51-
.compile(black_box(program), false, Some(Default::default()))
51+
.compile(black_box(program), false, Some(Default::default()), None)
5252
.unwrap();
53-
let object = module_to_object(module.module(), OptLevel::None)
53+
let object = module_to_object(module.module(), OptLevel::None, None)
5454
.expect("to compile correctly to a object file");
5555
black_box(object)
5656
})
@@ -67,9 +67,9 @@ pub fn bench_compile_time(c: &mut Criterion) {
6767
c.bench_with_input(BenchmarkId::new(filename, 1), &program, |b, program| {
6868
b.iter(|| {
6969
let module = native_context
70-
.compile(black_box(program), false, Some(Default::default()))
70+
.compile(black_box(program), false, Some(Default::default()), None)
7171
.unwrap();
72-
let object = module_to_object(module.module(), OptLevel::None)
72+
let object = module_to_object(module.module(), OptLevel::None, None)
7373
.expect("to compile correctly to a object file");
7474
black_box(object)
7575
})
@@ -86,9 +86,9 @@ pub fn bench_compile_time(c: &mut Criterion) {
8686
c.bench_with_input(BenchmarkId::new(filename, 1), &program, |b, program| {
8787
b.iter(|| {
8888
let module = native_context
89-
.compile(black_box(program), false, Some(Default::default()))
89+
.compile(black_box(program), false, Some(Default::default()), None)
9090
.unwrap();
91-
let object = module_to_object(module.module(), OptLevel::Aggressive)
91+
let object = module_to_object(module.module(), OptLevel::Aggressive, None)
9292
.expect("to compile correctly to a object file");
9393
black_box(object)
9494
})

‎benches/libfuncs.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ pub fn bench_libfuncs(c: &mut Criterion) {
5555
let native_context = NativeContext::new();
5656
b.iter(|| {
5757
let module = native_context
58-
.compile(program, false, Some(Default::default()))
58+
.compile(program, false, Some(Default::default()), None)
5959
.unwrap();
6060
// pass manager internally verifies the MLIR output is correct.
6161
let native_executor =
@@ -77,7 +77,7 @@ pub fn bench_libfuncs(c: &mut Criterion) {
7777
|b, program| {
7878
let native_context = NativeContext::new();
7979
let module = native_context
80-
.compile(program, false, Some(Default::default()))
80+
.compile(program, false, Some(Default::default()), None)
8181
.unwrap();
8282
// pass manager internally verifies the MLIR output is correct.
8383
let native_executor =
@@ -108,7 +108,7 @@ pub fn bench_libfuncs(c: &mut Criterion) {
108108
let native_context = NativeContext::new();
109109
b.iter(|| {
110110
let module = native_context
111-
.compile(program, false, Some(Default::default()))
111+
.compile(program, false, Some(Default::default()), None)
112112
.unwrap();
113113
// pass manager internally verifies the MLIR output is correct.
114114
let native_executor =
@@ -130,7 +130,7 @@ pub fn bench_libfuncs(c: &mut Criterion) {
130130
|b, program| {
131131
let native_context = NativeContext::new();
132132
let module = native_context
133-
.compile(program, false, Some(Default::default()))
133+
.compile(program, false, Some(Default::default()), None)
134134
.unwrap();
135135
// pass manager internally verifies the MLIR output is correct.
136136
let native_executor =

‎examples/easy_api.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fn main() {
1616

1717
// Compile the sierra program into a MLIR module.
1818
let native_program = native_context
19-
.compile(&sierra_program, false, Some(Default::default()))
19+
.compile(&sierra_program, false, Some(Default::default()), None)
2020
.unwrap();
2121

2222
// The parameters of the entry point.

‎examples/erc20.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ fn main() {
322322
let native_context = NativeContext::new();
323323

324324
let native_program = native_context
325-
.compile(&sierra_program, false, Some(Default::default()))
325+
.compile(&sierra_program, false, Some(Default::default()), None)
326326
.unwrap();
327327

328328
let entry_point_fn =

‎examples/invoke.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fn main() {
2121
let native_context = NativeContext::new();
2222

2323
let native_program = native_context
24-
.compile(&sierra_program, false, Some(Default::default()))
24+
.compile(&sierra_program, false, Some(Default::default()), None)
2525
.unwrap();
2626

2727
// Call the echo function from the contract using the generated wrapper.

0 commit comments

Comments
 (0)