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

chore: bump icicle to v2.8.0 #595

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

chore: bump icicle to v2.8.0 #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c835ff1
stress_test_gpu
mrain May 29, 2024
59adae1
comment
mrain May 29, 2024
87dc6c6
upgrade to icicle 2.3.1
mrain May 29, 2024
73af41a
Merge branch 'main' of github.com:EspressoSystems/jellyfish into cl/i…
mrain Jun 10, 2024
84be0dd
bump to 2.4.0
mrain Jun 10, 2024
f5d321f
Merge branch 'main' of github.com:EspressoSystems/jellyfish into cl/i…
mrain Jul 2, 2024
b04130a
bump icicle to 2.6.0
mrain Jul 2, 2024
e7ec82a
Merge branch 'main' into cl/icicle
mrain Jul 8, 2024
b97a147
Merge branch 'main' of github.com:EspressoSystems/jellyfish into cl/i…
mrain Aug 15, 2024
603d765
upgrade icicle
mrain Aug 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
7 changes: 4 additions & 3 deletions pcs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ ark-serialize = { workspace = true }
ark-std = { workspace = true }
derivative = { workspace = true }
displaydoc = { workspace = true }
icicle-bn254 = { git = "https://github.com/ingonyama-zk/icicle.git", tag = "v1.5.1", optional = true, features = ["arkworks"] }
icicle-core = { git = "https://github.com/ingonyama-zk/icicle.git", tag = "v1.5.1", optional = true }
icicle-cuda-runtime = { git = "https://github.com/ingonyama-zk/icicle.git", tag = "v1.5.1", optional = true }
icicle-bn254 = { git = "https://github.com/ingonyama-zk/icicle.git", tag = "v2.8.0", optional = true, features = ["arkworks"] }
icicle-core = { git = "https://github.com/ingonyama-zk/icicle.git", tag = "v2.8.0", optional = true, features = ["arkworks"] }
icicle-cuda-runtime = { git = "https://github.com/ingonyama-zk/icicle.git", tag = "v2.8.0", optional = true }
itertools = { workspace = true, features = ["use_alloc"] }
jf-utils = { git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5", default-features = false }
merlin = { workspace = true }
Expand Down Expand Up @@ -66,3 +66,4 @@ icicle = [
"anyhow", "ark-bn254", "icicle-cuda-runtime", "icicle-core",
"icicle-bn254", "parallel",
]
kzg-print-trace = ["ark-std/print-trace"]
4 changes: 2 additions & 2 deletions pcs/benches/kzg_gpu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ where
let supported_degree = 2usize.pow(MAX_LOG_DEGREE as u32);
let pp = UnivariateKzgPCS::<E>::gen_srs_for_testing(&mut rng, supported_degree).unwrap();
let (full_ck, _vk) = pp.trim(supported_degree).unwrap();
let mut srs_on_gpu = <UnivariateKzgPCS<E> as GPUCommittable<E>>::load_prover_param_to_gpu(
let srs_on_gpu = <UnivariateKzgPCS<E> as GPUCommittable<E>>::load_prover_param_to_gpu(
full_ck,
supported_degree,
)
Expand All @@ -75,7 +75,7 @@ where
|b, _log_degree| {
b.iter(|| {
<UnivariateKzgPCS<E> as GPUCommittable<E>>::gpu_commit_with_loaded_prover_param(
&mut srs_on_gpu,
&srs_on_gpu,
&p,
&stream,
)
Expand Down
9 changes: 6 additions & 3 deletions pcs/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,10 @@ pub mod icicle_deps {
curve::{Affine as IcicleAffine, Curve as IcicleCurve, Projective as IcicleProjective},
msm::{MSMConfig, MSM},
};
pub use icicle_cuda_runtime::{memory::HostOrDeviceSlice, stream::CudaStream};
pub use icicle_cuda_runtime::{
memory::{DeviceSlice, DeviceVec, HostOrDeviceSlice, HostSlice},
stream::CudaStream,
};

/// curve-specific types both from arkworks and from ICICLE
/// including Pairing, CurveCfg, Fr, Fq etc.
Expand All @@ -435,8 +438,8 @@ pub mod icicle_deps {
/// Create a new stream and warmup
pub fn warmup_new_stream() -> anyhow::Result<CudaStream> {
let stream = CudaStream::create().map_err(|e| anyhow!("{:?}", e))?;
let _warmup_bytes = HostOrDeviceSlice::<'_, u8>::cuda_malloc_async(1024, &stream)
.map_err(|e| anyhow!("{:?}", e))?;
let _warmup_bytes =
DeviceVec::<u8>::cuda_malloc_async(1024, &stream).map_err(|e| anyhow!("{:?}", e))?;
Comment on lines 439 to +442
Copy link
Contributor

Choose a reason for hiding this comment

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

i think we can forgo this function in favor of out-of-box: https://github.com/ingonyama-zk/icicle/blob/621676bd41659bc101f29dc7ac54f29c7cdaa92b/wrappers/rust/icicle-cuda-runtime/src/device.rs#L44

Ok(stream)
}
}
Loading
Loading