Skip to content

Add support for long-running CUDA prover #1187

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

Closed
gswirski wants to merge 1 commit into from
Closed

Add support for long-running CUDA prover #1187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
78 changes: 57 additions & 21 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@ codegen-units = 1
lto = true

[workspace.dependencies]
assembly = { package = "miden-assembly", version = "0.12", default-features = false }
assembly = { path = "../miden-vm/assembly", package = "miden-assembly", default-features = false }
assert_matches = { version = "1.5", default-features = false }
miden-block-prover = { path = "crates/miden-block-prover", version = "0.8", default-features = false }
miden-crypto = { version = "0.13", default-features = false }
miden-lib = { path = "crates/miden-lib", version = "0.8", default-features = false }
miden-objects = { path = "crates/miden-objects", version = "0.8", default-features = false }
miden-prover = { version = "0.12", default-features = false }
miden-stdlib = { version = "0.12", default-features = false }
miden-prover = { path = "../miden-vm/prover", default-features = false }
miden-stdlib = { path = "../miden-vm/stdlib", default-features = false }
miden-tx = { path = "crates/miden-tx", version = "0.8", default-features = false }
miden-tx-batch-prover = { path = "crates/miden-tx-batch-prover", version = "0.8", default-features = false }
miden-verifier = { version = "0.12", default-features = false }
miden-verifier = { path = "../miden-vm/verifier", default-features = false }
rand = { version = "0.8", default-features = false }
thiserror = { version = "2.0", default-features = false }
vm-core = { package = "miden-core", version = "0.12", default-features = false }
vm-processor = { package = "miden-processor", version = "0.12", default-features = false }
vm-core = { path = "../miden-vm/core", package = "miden-core", default-features = false }
vm-processor = { path = "../miden-vm/processor", package = "miden-processor", default-features = false }
5 changes: 5 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ test-prove: ## Run `prove` tests (tests which use the Miden prover)
$(DEBUG_ASSERTIONS) $(BACKTRACE) cargo nextest run --profile prove --cargo-profile test-release --features concurrent,testing --filter-expr "test(prove)"


.PHONY: test-prove-cuda
test-prove-cuda: ## Run `prove` tests (tests which use the Miden prover)
$(DEBUG_ASSERTIONS) $(BACKTRACE) MIDEN_CUDA_MEM_SIZE_MB=1024 cargo nextest run --profile prove --cargo-profile test-release --features concurrent,testing,cuda --filter-expr "test(prove)"


.PHONY: test
test: test-default test-prove ## Run all tests

Expand Down
4 changes: 2 additions & 2 deletions bin/proving-service/src/api/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ impl ProverRpcApi {
&self,
transaction_witness: TransactionWitness,
) -> Result<Response<ProvingResponse>, tonic::Status> {
let prover = self
let mut prover = self
.provers
.try_lock()
.map_err(|_| Status::resource_exhausted("Server is busy handling another request"))?;

let prover = prover
.tx_prover
.as_ref()
.as_mut()
.ok_or(Status::unimplemented("Transaction prover is not enabled"))?;

let proof = prover.prove(transaction_witness).map_err(internal_error)?;
Expand Down
2 changes: 1 addition & 1 deletion crates/miden-proving-service-client/src/proving_service/tx_prover.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ impl RemoteTransactionProver {
#[async_trait::async_trait(?Send)]
impl TransactionProver for RemoteTransactionProver {
async fn prove(
&self,
&mut self,
tx_witness: TransactionWitness,
) -> Result<ProvenTransaction, TransactionProverError> {
use miden_objects::utils::Serializable;
Expand Down
1 change: 1 addition & 0 deletions crates/miden-tx/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ path = "tests/integration/main.rs"
[features]
async = ["winter-maybe-async/async"]
concurrent = ["miden-prover/concurrent", "std"]
cuda = ["miden-prover/cuda"]
default = ["std"]
std = ["miden-lib/std", "miden-objects/std", "miden-prover/std", "miden-verifier/std", "vm-processor/std"]
testing = ["miden-objects/testing", "miden-lib/testing", "vm-processor/testing", "dep:rand_chacha"]
Expand Down
11 changes: 7 additions & 4 deletions crates/miden-tx/src/prover/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use miden_objects::{
assembly::Library,
transaction::{OutputNote, ProvenTransaction, ProvenTransactionBuilder, TransactionWitness},
};
use miden_prover::prove;
use miden_prover::Prover;
pub use miden_prover::ProvingOptions;
use vm_processor::MemAdviceProvider;
use winter_maybe_async::*;
Expand All @@ -31,7 +31,7 @@ pub trait TransactionProver {
/// - If the transaction result is corrupt.
#[maybe_async]
fn prove(
&self,
&mut self,
tx_witness: TransactionWitness,
) -> Result<ProvenTransaction, TransactionProverError>;
}
Expand All @@ -43,6 +43,7 @@ pub trait TransactionProver {
///
/// Local Transaction Prover implements the [TransactionProver] trait.
pub struct LocalTransactionProver {
prover: Prover,
mast_store: Arc<TransactionMastStore>,
proof_options: ProvingOptions,
}
Expand All @@ -51,6 +52,7 @@ impl LocalTransactionProver {
/// Creates a new [LocalTransactionProver] instance.
pub fn new(proof_options: ProvingOptions) -> Self {
Self {
prover: Prover::new(),
mast_store: Arc::new(TransactionMastStore::new()),
proof_options,
}
Expand All @@ -68,6 +70,7 @@ impl LocalTransactionProver {
impl Default for LocalTransactionProver {
fn default() -> Self {
Self {
prover: Prover::new(),
mast_store: Arc::new(TransactionMastStore::new()),
proof_options: Default::default(),
}
Expand All @@ -78,7 +81,7 @@ impl Default for LocalTransactionProver {
impl TransactionProver for LocalTransactionProver {
#[maybe_async]
fn prove(
&self,
&mut self,
tx_witness: TransactionWitness,
) -> Result<ProvenTransaction, TransactionProverError> {
let TransactionWitness {
Expand Down Expand Up @@ -115,7 +118,7 @@ impl TransactionProver for LocalTransactionProver {
)
.map_err(TransactionProverError::TransactionHostCreationFailed)?;

let (stack_outputs, proof) = maybe_await!(prove(
let (stack_outputs, proof) = maybe_await!(self.prover.prove(
&TransactionKernel::main(),
stack_inputs,
&mut host,
Expand Down
2 changes: 1 addition & 1 deletion crates/miden-tx/src/tests/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@ fn prove_witness_and_verify() {
let executed_transaction_id = executed_transaction.id();

let proof_options = ProvingOptions::default();
let prover = LocalTransactionProver::new(proof_options);
let mut prover = LocalTransactionProver::new(proof_options);
let proven_transaction = prover.prove(executed_transaction.into()).unwrap();

assert_eq!(proven_transaction.id(), executed_transaction_id);
Expand Down
2 changes: 1 addition & 1 deletion crates/miden-tx/tests/integration/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ pub fn prove_and_verify_transaction(
// Prove the transaction

let proof_options = ProvingOptions::default();
let prover = LocalTransactionProver::new(proof_options);
let mut prover = LocalTransactionProver::new(proof_options);
let proven_transaction = prover.prove(executed_transaction.into()).unwrap();

assert_eq!(proven_transaction.id(), executed_transaction_id);
Expand Down