From 988394220f205616fecca8aff57e16304b8ef897 Mon Sep 17 00:00:00 2001 From: Sinka Date: Thu, 10 Oct 2024 11:44:04 +0200 Subject: [PATCH] using Delphinuslab's native msm cuda --- Cargo.lock | 196 ++++++++++++----------------------------------------- Cargo.toml | 2 +- 2 files changed, 43 insertions(+), 155 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 116bf8117..943975229 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -211,29 +211,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bindgen" -version = "0.69.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" -dependencies = [ - "bitflags 2.4.2", - "cexpr", - "clang-sys", - "itertools", - "lazy_static", - "lazycell", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.52", - "which", -] - [[package]] name = "bitflags" version = "1.3.2" @@ -339,15 +316,6 @@ version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - [[package]] name = "cfg-if" version = "0.1.10" @@ -397,7 +365,7 @@ dependencies = [ [[package]] name = "circuits-batcher" version = "0.1.0" -source = "git+https://github.com/DelphinusLab/continuation-batcher.git?tag=on-prove-pairing-2.2#3300127b830848585a8bc75e7e620d39f4fff486" +source = "git+https://github.com/DelphinusLab/continuation-batcher.git?tag=on-prove-pairing-2.7#9f9c288baf027d5306f8f320c98022548fc6ea81" dependencies = [ "anyhow", "ark-std", @@ -429,18 +397,44 @@ dependencies = [ "uuid", "wabt", "wast", - "zkwasm-prover", ] [[package]] -name = "clang-sys" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +name = "circuits-batcher" +version = "0.1.0" +source = "git+https://github.com/DelphinusLab/continuation-batcher.git?tag=stable-shuffle-1.0#904a0c1b03027b6cf256d9ccd44d8eb5abbac69a" dependencies = [ - "glob 0.3.1", - "libc", - "libloading", + "anyhow", + "ark-std", + "bitvec", + "clap", + "downcast-rs", + "env_logger", + "ff", + "halo2_proofs", + "halo2aggregator-s", + "hex", + "lazy_static", + "log", + "lru", + "md5", + "num", + "num-bigint", + "num-derive", + "num-integer", + "num-traits", + "quote", + "rand", + "serde", + "serde_json", + "sha2", + "sha3", + "strum", + "strum_macros", + "uuid", + "wabt", + "wast", + "zkwasm-prover", ] [[package]] @@ -1175,7 +1169,7 @@ dependencies = [ [[package]] name = "halo2aggregator-s" version = "1.1.0" -source = "git+https://github.com/DelphinusLab/halo2aggregator-s.git?tag=on-prove-pairing-0.6.2#f699aac4e726b7c27936741846975a5c199fce5a" +source = "git+https://github.com/DelphinusLab/halo2aggregator-s.git?tag=on-prove-pairing-0.6.4#2ce6522fce52938ec7d28c7c1510be4dd85e5be2" dependencies = [ "ark-ff", "ark-std", @@ -1199,7 +1193,7 @@ dependencies = [ [[package]] name = "halo2ecc-s" version = "0.3.2" -source = "git+https://github.com/DelphinusLab/halo2ecc-s.git?tag=on-prove-pairing-0.6.2#15b3baefac2f950e448ff1dca7c8562bf10ba8a0" +source = "git+https://github.com/DelphinusLab/halo2ecc-s.git?tag=on-prove-pairing-0.6.4#164b8367cc243f28128c785930859fa536b5c7af" dependencies = [ "ark-std", "halo2_proofs", @@ -1261,15 +1255,6 @@ dependencies = [ "digest", ] -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "hostname" version = "0.3.1" @@ -1319,34 +1304,6 @@ dependencies = [ "cc", ] -[[package]] -name = "icicle-bn254" -version = "1.7.0" -source = "git+https://github.com/ingonyama-zk/icicle.git?tag=v1.7.0#1abd2ef9c9b4e387ded2333b18e22e95d90f6653" -dependencies = [ - "cmake", - "icicle-core", - "icicle-cuda-runtime", -] - -[[package]] -name = "icicle-core" -version = "1.7.0" -source = "git+https://github.com/ingonyama-zk/icicle.git?tag=v1.7.0#1abd2ef9c9b4e387ded2333b18e22e95d90f6653" -dependencies = [ - "icicle-cuda-runtime", - "rayon", -] - -[[package]] -name = "icicle-cuda-runtime" -version = "1.7.0" -source = "git+https://github.com/ingonyama-zk/icicle.git?tag=v1.7.0#1abd2ef9c9b4e387ded2333b18e22e95d90f6653" -dependencies = [ - "bindgen", - "bitflags 1.3.2", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -1499,12 +1456,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "leb128" version = "0.2.5" @@ -1517,16 +1468,6 @@ version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" -[[package]] -name = "libloading" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" -dependencies = [ - "cfg-if 1.0.0", - "windows-targets 0.52.4", -] - [[package]] name = "libm" version = "0.2.8" @@ -1640,12 +1581,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" version = "0.7.2" @@ -1713,16 +1648,6 @@ dependencies = [ "webpki-roots", ] -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - [[package]] name = "num" version = "0.4.1" @@ -2042,7 +1967,7 @@ checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" [[package]] name = "poseidon" version = "0.2.0" -source = "git+https://github.com/DelphinusLab/poseidon#162fc28c2c1fa361d0851a1f50c3e9c2c65c0042" +source = "git+https://github.com/DelphinusLab/poseidon#8977ca390f50cdbd2496970216dfc1060b2caab9" dependencies = [ "halo2_proofs", "subtle", @@ -2060,16 +1985,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "prettyplease" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" -dependencies = [ - "proc-macro2", - "syn 2.0.52", -] - [[package]] name = "proc-macro-error" version = "1.0.4" @@ -2297,12 +2212,6 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc_version" version = "0.2.3" @@ -2540,12 +2449,6 @@ dependencies = [ "keccak", ] -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -3230,18 +3133,6 @@ version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - [[package]] name = "widestring" version = "1.0.2" @@ -3508,7 +3399,7 @@ dependencies = [ "anyhow", "bincode", "cfg-if 1.0.0", - "circuits-batcher", + "circuits-batcher 0.1.0 (git+https://github.com/DelphinusLab/continuation-batcher.git?tag=stable-shuffle-1.0)", "clap", "console", "delphinus-host", @@ -3530,12 +3421,12 @@ dependencies = [ [[package]] name = "zkwasm-host-circuits" version = "0.1.0" -source = "git+https://github.com/DelphinusLab/zkWasm-host-circuits.git?branch=host-op-1.8#52c7ca4093ed845dad59bc2bfc020733bedc0634" +source = "git+https://github.com/DelphinusLab/zkWasm-host-circuits.git?branch=host-op-1.8#35eb3beef3a98d6a826a06692421ba17bc9930bb" dependencies = [ "anyhow", "ark-std", "cfg-if 1.0.0", - "circuits-batcher", + "circuits-batcher 0.1.0 (git+https://github.com/DelphinusLab/continuation-batcher.git?tag=on-prove-pairing-2.7)", "clap", "ff", "halo2_proofs", @@ -3562,15 +3453,12 @@ dependencies = [ [[package]] name = "zkwasm-prover" version = "0.1.0" -source = "git+https://github.com/DelphinusLab/zkWasm-prover.git#d3f62bf8e3a56839016a0dc1337fe6cccdfc011f" +source = "git+https://github.com/DelphinusLab/zkWasm-prover.git?branch=oogl/dev-msm#87c03e793987c65af8d2888fd67fa7eb470bd99a" dependencies = [ "ark-std", "cc", "cuda-runtime-sys", "halo2_proofs", - "icicle-bn254", - "icicle-core", - "icicle-cuda-runtime", "lazy_static", "libc", "rand", diff --git a/Cargo.toml b/Cargo.toml index d5c3e7abf..63e0ca1df 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ regex = "1.10.2" static_assertions = "1.1.0" wasmi = { path = "third-party/wasmi" } zkwasm-host-circuits = { git = "https://github.com/DelphinusLab/zkWasm-host-circuits.git", branch="host-op-1.8" } -circuits-batcher = { git = "https://github.com/DelphinusLab/continuation-batcher.git", tag="on-prove-pairing-2.2" } +circuits-batcher = { git = "https://github.com/DelphinusLab/continuation-batcher.git", tag="stable-shuffle-1.0" } poseidon = { git = "https://github.com/DelphinusLab/poseidon" } [profile.dev]