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

Bump ff & group to 0.13 #179

Merged
merged 8 commits into from
Apr 18, 2023
Merged

Conversation

huitseeker
Copy link
Member

@huitseeker huitseeker commented Apr 13, 2023

Still testing this, in particular, the rust-gpu-tools import on the cuda / opencl features may have some issues.

Edit: solved by upgrading rust-gpu-tools to 0.7.1 in upstream ec_gpu.

Depends on filecoin-project/bellperson#304
Fixes #171

Edit(4/14): this needs work on the pasta-fil-curves repo.
Edit. (4/15): I'm seeing issues with tree builder tests hanging on opencl. Is this something you're seeing as well @porcuquine ?

Historical (solved) issue:
https://gist.github.com/huitseeker/230caa8cd63e049846f95ac0d8c77fe5

huitseeker@lightning.local➜~/tmp/neptune(bump_ff_group)» cargo tree -p rust-gpu-tools -i                                                                                                                                             [12:48:10]
warning: patch for `blstrs` uses the features mechanism. default-features and features will not take effect because the patch dependency does not support this mechanism
rust-gpu-tools v0.7.0
└── ec-gpu-gen v0.5.2 (https://github.com/filecoin-project/ec-gpu/?branch=upgrade-ff-013#9616bd3c)
    ├── bellperson v0.24.1 (https://github.com/huitseeker/bellperson?branch=update-ff-group#36a75691)
    │   ├── gbench v0.5.4 (/Users/huitseeker/tmp/neptune/gbench)
    │   └── neptune v8.1.1 (/Users/huitseeker/tmp/neptune)
    │       └── gbench v0.5.4 (/Users/huitseeker/tmp/neptune/gbench)
    ├── gbench v0.5.4 (/Users/huitseeker/tmp/neptune/gbench)
    └── neptune v8.1.1 (/Users/huitseeker/tmp/neptune) (*)
    [build-dependencies]
    ├── bellperson v0.24.1 (https://github.com/huitseeker/bellperson?branch=update-ff-group#36a75691) (*)
    └── neptune v8.1.1 (/Users/huitseeker/tmp/neptune) (*)
    ```

@vmx
Copy link
Contributor

vmx commented Apr 14, 2023

The problem was that CudaContexts wasn't Send. I've just released version 0.7.1 which should fix the issue.

@huitseeker huitseeker force-pushed the bump_ff_group branch 4 times, most recently from b69de9c to 2b49ddf Compare April 14, 2023 15:13
@huitseeker huitseeker marked this pull request as ready for review April 14, 2023 15:20
@huitseeker huitseeker force-pushed the bump_ff_group branch 3 times, most recently from ec04d06 to 4e75cce Compare April 14, 2023 19:52
@vmx
Copy link
Contributor

vmx commented Apr 14, 2023

Edit(4/14): this needs work on the pasta-fil-curves repo.

The nice thing about this upgrade is that fil_pasta_curves should no longer be needed. Upstream pasta_curves should just work.

@huitseeker huitseeker marked this pull request as draft April 15, 2023 15:51
@huitseeker huitseeker force-pushed the bump_ff_group branch 5 times, most recently from 26be41e to ee14056 Compare April 15, 2023 16:21
@huitseeker
Copy link
Member Author

@vmx Correct. A msiconfig in test flags momentarily made me think there was something missing in ec_gpu. Fixed in 267bf6d.

@huitseeker huitseeker marked this pull request as ready for review April 15, 2023 16:22
gbench/Cargo.toml Outdated Show resolved Hide resolved
@huitseeker
Copy link
Member Author

Took a while, but I can now confirm this works on both cuda and opencl:

EC_GPU_FRAMEWORK=opencl cargo test --release  --features "arity2,arity4,arity8,arity11,arity16,arity24,arity36,pasta,opencl,bls" -- --test-threads=1 --nocapture

https://gist.github.com/huitseeker/e79b04794276989604c646d296662d27

EC_GPU_FRAMEWORK=cuda cargo test --release  --features "arity2,arity4,arity8,arity11,arity16,arity24,arity36,pasta,cuda,bls" -- --test-threads=1 --nocapture

https://gist.github.com/huitseeker/98f65366722d5296bcc4037081e41bb9

@huitseeker huitseeker merged commit fefe5b7 into argumentcomputer:master Apr 18, 2023
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.

Upgrading ff and group crates
4 participants