Skip to content

Add poseidon fixes to sp1-new-tmp branch#7

Merged
mpenciak merged 12 commits into
sp1-new-tmpfrom
mp/sp1-new-tmp-fixes
Jun 18, 2024
Merged

Add poseidon fixes to sp1-new-tmp branch#7
mpenciak merged 12 commits into
sp1-new-tmpfrom
mp/sp1-new-tmp-fixes

Conversation

@mpenciak
Copy link
Copy Markdown

This PR moves the commits from ah/poseidon-arbitrary-width to the top of the sp1-new-tmp branch.

adr1anh and others added 8 commits June 18, 2024 14:43
Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>
Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>
Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>
Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>
Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>
arthurpaulino
arthurpaulino previously approved these changes Jun 18, 2024
Copy link
Copy Markdown
Member

@arthurpaulino arthurpaulino left a comment

Choose a reason for hiding this comment

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

I recognize these commit messages from the PR that ultimately made Lair work (#5), so I'm good with these changes

adr1anh and others added 2 commits June 18, 2024 15:07
Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>
adr1anh
adr1anh previously approved these changes Jun 18, 2024
Copy link
Copy Markdown

@wwared wwared left a comment

Choose a reason for hiding this comment

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

Blocking until Sphinx compiles with these changes - specifically the From bounds on matmul_internal. Talking with @mpenciak over whether this can be changed only on plonky3 (keeping the API the same) or if it requires a corresponding sphinx PR/patch

@mpenciak mpenciak dismissed stale reviews from adr1anh and arthurpaulino via b6735b8 June 18, 2024 19:28
wwared
wwared previously approved these changes Jun 18, 2024
Copy link
Copy Markdown

@wwared wwared left a comment

Choose a reason for hiding this comment

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

Alright let's unblock poseidon2

@mpenciak mpenciak merged commit 5ba3f6a into sp1-new-tmp Jun 18, 2024
@mpenciak mpenciak deleted the mp/sp1-new-tmp-fixes branch June 18, 2024 19:34
This was referenced Jun 19, 2024
wwared added a commit that referenced this pull request Jun 20, 2024
* Allow more generic Poseidon2 width

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Arbitrary width for matrix.rs

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Make `supported_width` constant and comment

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Make `matmul_exterior` Air friendly

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Remove `PrimeField` bounds

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* re-add `condition` method to `FilteredAirBuilder`

* Acknowledge clippy

* Acknowledge cargo fmt

* Remove `PrimeField` bounds

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Acknowledge cargo fmt

* fix: Attempt to remove From bound from matmul_internal

* acknowledge cargo fmt

---------

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>
Co-authored-by: Adrian Hamelink <adrian.hamelink@gmail.com>
Co-authored-by: wwared <wwared@users.noreply.github.com>
huitseeker pushed a commit that referenced this pull request Aug 3, 2024
* Allow more generic Poseidon2 width

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Arbitrary width for matrix.rs

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Make `supported_width` constant and comment

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Make `matmul_exterior` Air friendly

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Remove `PrimeField` bounds

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* re-add `condition` method to `FilteredAirBuilder`

* Acknowledge clippy

* Acknowledge cargo fmt

* Remove `PrimeField` bounds

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Acknowledge cargo fmt

* fix: Attempt to remove From bound from matmul_internal

* acknowledge cargo fmt

---------

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>
Co-authored-by: Adrian Hamelink <adrian.hamelink@gmail.com>
Co-authored-by: wwared <wwared@users.noreply.github.com>
huitseeker pushed a commit that referenced this pull request Aug 11, 2024
* Allow more generic Poseidon2 width

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Arbitrary width for matrix.rs

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Make `supported_width` constant and comment

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Make `matmul_exterior` Air friendly

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Remove `PrimeField` bounds

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* re-add `condition` method to `FilteredAirBuilder`

* Acknowledge clippy

* Acknowledge cargo fmt

* Remove `PrimeField` bounds

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Acknowledge cargo fmt

* fix: Attempt to remove From bound from matmul_internal

* acknowledge cargo fmt

---------

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>
Co-authored-by: Adrian Hamelink <adrian.hamelink@gmail.com>
Co-authored-by: wwared <wwared@users.noreply.github.com>
huitseeker pushed a commit that referenced this pull request Aug 12, 2024
* Allow more generic Poseidon2 width

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Arbitrary width for matrix.rs

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Make `supported_width` constant and comment

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Make `matmul_exterior` Air friendly

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Remove `PrimeField` bounds

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* re-add `condition` method to `FilteredAirBuilder`

* Acknowledge clippy

* Acknowledge cargo fmt

* Remove `PrimeField` bounds

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Acknowledge cargo fmt

* fix: Attempt to remove From bound from matmul_internal

* acknowledge cargo fmt

---------

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>
Co-authored-by: Adrian Hamelink <adrian.hamelink@gmail.com>
Co-authored-by: wwared <wwared@users.noreply.github.com>
huitseeker pushed a commit that referenced this pull request Aug 14, 2024
* Allow more generic Poseidon2 width

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Arbitrary width for matrix.rs

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Make `supported_width` constant and comment

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Make `matmul_exterior` Air friendly

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Remove `PrimeField` bounds

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* re-add `condition` method to `FilteredAirBuilder`

* Acknowledge clippy

* Acknowledge cargo fmt

* Remove `PrimeField` bounds

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>

* Acknowledge cargo fmt

* fix: Attempt to remove From bound from matmul_internal

* acknowledge cargo fmt

---------

Signed-off-by: Adrian Hamelink <adrian.hamelink@gmail.com>
Co-authored-by: Adrian Hamelink <adrian.hamelink@gmail.com>
Co-authored-by: wwared <wwared@users.noreply.github.com>
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.

4 participants