Skip to content
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.

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

Import p3 implementation #1845

Merged
merged 2 commits into from
Sep 30, 2024
Merged

Import p3 implementation #1845

merged 2 commits into from
Sep 30, 2024

Conversation

Schaeff
Copy link
Collaborator

@Schaeff Schaeff commented Sep 26, 2024

This PR is only a copy paste from https://github.com/powdr-labs/plonky3 with the following exceptions:

  • only the files that differ from uni-stark are copied over. Any references to other modules are targeting upstream uni-stark
  • the preprocessed_width function is moved to the MultiStageAir trait from BaseAir to avoid changes to p3-air
  • upstream uni-stark is nostd. Our wrapper uses things like hashmaps and mutexes, so for now I commented out nostd
  • lib.rs is a merge of the existing lib.rs and that of our uni-stark fork
  • the prove function is removed, as it is only there for compatibility with uni-stark tests
  • FieldMerkleTreeMmcs was renamed to MerkleTreeMmcs in plonky3 since we forked it. Our configs use this type and the name is updated accordingly

TODO:

  • extract rust update to separate PR due to the new ways clippy complains

@Schaeff Schaeff mentioned this pull request Sep 26, 2024
1 task
github-merge-queue bot pushed a commit that referenced this pull request Sep 27, 2024
This is a prerequisite for #1845 

TODO:
- [x] narrow down or remove the dead_code exception
@leonardoalt
Copy link
Member

needs a rebase/merge maybe?

- name: Install Rust toolchain 1.77 (with clippy and rustfmt)
run: rustup toolchain install 1.77-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain 1.77-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain 1.77-x86_64-unknown-linux-gnu
- name: Install Rust toolchain 1.81 (with clippy and rustfmt)
run: rustup toolchain install 1.81-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain 1.81-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain 1.81-x86_64-unknown-linux-gnu
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These look like rebase/merge leftovers.

- name: Install Rust toolchain 1.77 (with clippy and rustfmt)
run: rustup toolchain install 1.77-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain 1.77-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain 1.77-x86_64-unknown-linux-gnu
- name: Install Rust toolchain 1.81 (with clippy and rustfmt)
run: rustup toolchain install 1.81-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain 1.81-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain 1.81-x86_64-unknown-linux-gnu
- name: Install EStarkPolygon prover dependencies
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like the same leftovers from rebase/merge

@Schaeff Schaeff force-pushed the import-p3-implementation branch from 9b0ac77 to 2e660d5 Compare September 30, 2024 10:10
@Schaeff
Copy link
Collaborator Author

Schaeff commented Sep 30, 2024

Rebased

@Schaeff Schaeff requested a review from ShuangWu121 September 30, 2024 17:36
@leonardoalt leonardoalt added this pull request to the merge queue Sep 30, 2024
Merged via the queue into main with commit d96c590 Sep 30, 2024
14 checks passed
@leonardoalt leonardoalt deleted the import-p3-implementation branch September 30, 2024 21:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants