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.

Sign up for GitHub

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

Jump to bottom

Fix conflicts main #377

Merged
merged 10 commits into from
Feb 15, 2024
Merged

Fix conflicts main #377

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d367a8c
Bump for release
jeremyfelder Jan 31, 2024
382bec4
Mixed-radix NTT algorithm
yshekel Feb 8, 2024
18fdd05
Fix: examples path deps (#363)
jeremyfelder Feb 8, 2024
b5923a1
Add concurrency group to examples workflow (#361)
jeremyfelder Feb 8, 2024
a65f44a
fix versioning problems
ChickenLover Feb 9, 2024
d84ffd2
Release/1.3.0 (#370)
LeonHibnik Feb 9, 2024
fd08925
merge WIP
ChickenLover Feb 15, 2024
ba6c3ae
merge NTT part
yshekel Feb 15, 2024
4f471ff
remove rust toolchains
ChickenLover Feb 15, 2024
0929161
Merge branch 'dev' into fix-conflicts-main
ChickenLover Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/rust/msm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ icicle-bls12-377 = { path = "../../../wrappers/rust/icicle-curves/icicle-bls12-3
ark-bn254 = { version = "0.4.0", optional = true}
ark-bls12-377 = { version = "0.4.0", optional = true}
ark-ec = { version = "0.4.0", optional = true}
clap = { version = "4.4.12", features = ["derive"] }
clap = { version = "<=4.4.12", features = ["derive"] }

[features]
arkworks = ["ark-bn254", "ark-bls12-377", "ark-ec", "icicle-core/arkworks", "icicle-bn254/arkworks", "icicle-bls12-377/arkworks"]
Expand Down
3 changes: 3 additions & 0 deletions examples/rust/msm/rust-toolchain
View file
Open in desktop
Copy link
Contributor

@vhnatyk vhnatyk Feb 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

it was removed in bindings in dev, right?

Copy link
Collaborator

@yshekel yshekel Feb 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I removed 'wrappers/rust/rust-toolchain' but I am not sure about this one and the other one in the ntt examples.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[toolchain]
channel = "1.70.0"
components = ["rustfmt"]
2 changes: 1 addition & 1 deletion examples/rust/ntt/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ark-poly = "0.4.0"
ark-std = "0.4.0"
ark-bn254 = { version = "0.4.0" }
ark-bls12-377 = { version = "0.4.0" }
clap = { version = "4.4.12", features = ["derive"] }
clap = { version = "<=4.4.12", features = ["derive"] }

[features]
profile = []
3 changes: 3 additions & 0 deletions examples/rust/ntt/rust-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[toolchain]
channel = "1.70.0"
components = ["rustfmt"]
1 change: 0 additions & 1 deletion icicle/appUtils/ntt/tests/verification.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#include "primitives/field.cuh"
#include "primitives/projective.cuh"
#include "utils/cuda_utils.cuh"
#include <chrono>
#include <iostream>
#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion wrappers/rust/icicle-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "icicle-core"
version = "1.2.0"
version = "1.3.0"
edition = "2021"
authors = ["Ingonyama"]
description = "A library for GPU ZK acceleration by Ingonyama"
Expand Down
2 changes: 1 addition & 1 deletion wrappers/rust/icicle-cuda-runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "icicle-cuda-runtime"
version = "1.2.0"
version = "1.3.0"
edition = "2021"
authors = [ "Ingonyama" ]
description = "Ingonyama's Rust wrapper of CUDA runtime"
Expand Down
2 changes: 1 addition & 1 deletion wrappers/rust/icicle-curves/icicle-bls12-377/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "icicle-bls12-377"
version = "1.2.0"
version = "1.3.0"
edition = "2021"
authors = [ "Ingonyama" ]
description = "Rust wrapper for the CUDA implementation of BLS12-377 pairing friendly elliptic curve by Ingonyama"
Expand Down
2 changes: 1 addition & 1 deletion wrappers/rust/icicle-curves/icicle-bls12-381/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "icicle-bls12-381"
version = "1.2.0"
version = "1.3.0"
edition = "2021"
authors = [ "Ingonyama" ]
description = "Rust wrapper for the CUDA implementation of BLS12-381 pairing friendly elliptic curve by Ingonyama"
Expand Down
2 changes: 1 addition & 1 deletion wrappers/rust/icicle-curves/icicle-bn254/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "icicle-bn254"
version = "1.2.0"
version = "1.3.0"
edition = "2021"
authors = [ "Ingonyama" ]
description = "Rust wrapper for the CUDA implementation of BN254 pairing friendly elliptic curve by Ingonyama"
Expand Down
2 changes: 1 addition & 1 deletion wrappers/rust/icicle-curves/icicle-bw6-761/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "icicle-bw6-761"
version = "1.2.0"
version = "1.3.0"
edition = "2021"
authors = [ "Ingonyama" ]
description = "Rust wrapper for the CUDA implementation of BW6-761 pairing friendly elliptic curve by Ingonyama"
Expand Down
Loading