Skip to content

Commit 7193cc2

Browse files
Merge pull request #10450 from starkware-libs/dori/merge-main-v0.14.1-committer-into-main-1764243467
Merge main-v0.14.1-committer into main
2 parents c2e2dff + fb8aca9 commit 7193cc2

File tree

819 files changed

+103454
-46730
lines changed

Some content is hidden

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

819 files changed

+103454
-46730
lines changed

.cargo/config.toml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,3 @@
22
LLVM_SYS_191_PREFIX = "/usr/lib/llvm-19/"
33
MLIR_SYS_190_PREFIX = "/usr/lib/llvm-19/"
44
TABLEGEN_190_PREFIX = "/usr/lib/llvm-19/"
5-
6-
# Use `lld` for linking instead of `ld`, since we run out of memory while linking with `ld` on
7-
# 16-cores linux machines, see:
8-
# https://nnethercote.github.io/perf-book/build-configuration.html#linking.
9-
# TODO(Gilad): remove this once `rust` stabilizes `lld` as the default linker, currently only on nightly:
10-
# https://github.com/rust-lang/rust/issues/39915#issuecomment-618726211
11-
[target.'cfg(all(target_os = "linux"))']
12-
rustflags = ["-Clink-arg=-fuse-ld=lld"]

.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@
33
/logs
44
**/target/
55
.git
6-
!crates/papyrus_load_test/resources

.github/CODEOWNERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# GitHub CODEOWNERS file
2+
# This file defines who must review and approve changes to specific files or directories
3+
# For more information, see: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
4+
5+
# Require approval from the sequencer-cargo-owners team for workspace dependency changes
6+
Cargo.toml @starkware-libs/sequencer-cargo-owners

.github/ISSUE_TEMPLATE/01_BUG_REPORT.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
22
name: Bug Report
3-
about: Create a report to help Papyrus to improve
3+
about: Create a report to help Apollo to improve
44
title: "bug: "
55
labels: "bug"
66
assignees: ""
77
---
88

99
# Bug Report
1010

11-
**Papyrus version:**
11+
**Apollo version:**
1212

1313
<!-- Please specify commit or tag version. -->
1414

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.github/actions/bootstrap/action.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@ inputs:
1212
runs:
1313
using: "composite"
1414
steps:
15-
- name: Install ldd
16-
shell: bash
17-
run: |
18-
sudo apt-get update
19-
sudo apt-get remove -y man-db
20-
sudo apt-mark hold man-db
21-
sudo apt-get install -y --no-install-recommends build-essential binutils lld
22-
2315
- name: Install rust.
2416
uses: ./.github/actions/install_rust
2517
with:

.github/actions/install_rust/action.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ runs:
2121
# Install additional non-default toolchains (for rustfmt for example), NOP if input omitted.
2222
channel: ${{ inputs.extra_rust_toolchains }}
2323
env:
24-
RUSTFLAGS: "-C link-arg=-fuse-ld=lld"
2524
GITHUB_TOKEN: ${{ inputs.github_token }}
2625

2726
# This installation is _not_ cached, but takes a couple seconds: it's downloading prepackaged

.github/workflows/blockifier_ci.yml

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ on:
3737
- "scripts/sequencer-ci.Dockerfile"
3838

3939
env:
40-
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"
40+
RUSTFLAGS: "-D warnings"
41+
TRANSFERS_BENCHMARK_CAIRO_NATIVE_TIME_LIMIT_NS: "200000000"
42+
TRANSFERS_BENCHMARK_VM_TIME_LIMIT_NS: "1000000000"
4143

4244
# On PR events, cancel existing CI runs on this same PR for this workflow.
4345
# Also, create different concurrency groups for different pushed commits, on push events.
@@ -92,3 +94,43 @@ jobs:
9294
# tracing is not activated by any workspace crate; test the build.
9395
- run: cargo build -p blockifier --features tracing
9496
- run: cargo test -p blockifier --features tracing
97+
98+
# TODO(Dori): Uncomment once the merge to main is complete (bench_tools does not exist on commit
99+
# github.base_ref).
100+
# benchmarking:
101+
# runs-on: namespace-profile-medium-ubuntu-24-04-amd64
102+
# if: ${{ github.event_name == 'pull_request' }}
103+
# steps:
104+
# # Checkout the base branch to benchmark the old code.
105+
# - uses: actions/checkout@v4
106+
# with:
107+
# ref: ${{ github.base_ref }}
108+
109+
# - uses: ./.github/actions/bootstrap
110+
# with:
111+
# github_token: ${{ secrets.GITHUB_TOKEN }}
112+
113+
# # Restore cargo artifacts build cache.
114+
# - name: Restore Cargo build cache
115+
# uses: Swatinem/rust-cache@v2
116+
# with:
117+
# shared-key: blockifier-bench
118+
# cache-on-failure: true
119+
# cache-workspace-crates: true
120+
121+
# # Benchmark the base branch code.
122+
# - run: cargo run -p bench_tools -- run --package blockifier --out /tmp/base_results
123+
124+
# # Checkout the current branch to benchmark the new code.
125+
# - uses: actions/checkout@v4
126+
# with:
127+
# clean: false
128+
129+
# # Benchmark the current branch and compare to the previous run.
130+
# - run: |
131+
# cargo run -p bench_tools -- run-and-compare \
132+
# --package blockifier \
133+
# --out /tmp/new_results \
134+
# --regression-limit 8.0 \
135+
# --set-absolute-time-ns-limit transfers_benchmark_cairo_native ${TRANSFERS_BENCHMARK_CAIRO_NATIVE_TIME_LIMIT_NS} \
136+
# --set-absolute-time-ns-limit transfers_benchmark_vm ${TRANSFERS_BENCHMARK_VM_TIME_LIMIT_NS}

.github/workflows/blockifier_compiled_cairo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
- "scripts/dependencies.sh"
1515

1616
env:
17-
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"
17+
RUSTFLAGS: "-D warnings"
1818

1919
# On PR events, cancel existing CI runs on this same PR for this workflow.
2020
# Also, create different concurrency groups for different pushed commits, on push events.

.github/workflows/blockifier_reexecution_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
- "scripts/sequencer-ci.Dockerfile"
2020

2121
env:
22-
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"
22+
RUSTFLAGS: "-D warnings"
2323

2424
# On PR events, cancel existing CI runs on this same PR for this workflow.
2525
# Also, create different concurrency groups for different pushed commits, on push events.

0 commit comments

Comments
 (0)