From 51d4ce3ebcf048501e5b79f2b3cec07e2b5487aa Mon Sep 17 00:00:00 2001 From: ilitteri Date: Mon, 6 May 2024 19:07:39 -0300 Subject: [PATCH 1/5] Handle in_gpu_proof status --- core/lib/basic_types/src/prover_dal.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/lib/basic_types/src/prover_dal.rs b/core/lib/basic_types/src/prover_dal.rs index dc106da18a7..693c9138c3e 100644 --- a/core/lib/basic_types/src/prover_dal.rs +++ b/core/lib/basic_types/src/prover_dal.rs @@ -159,6 +159,8 @@ pub enum ProverJobStatus { Skipped, #[strum(serialize = "ignored")] Ignored, + #[strum(serialize = "in_gpu_proof")] + InGPUProof, } #[derive(Debug, Clone, strum::Display, strum::EnumString, strum::AsRefStr)] From cedd9d00c0a570c3f2fc84a89333a75ba58695f6 Mon Sep 17 00:00:00 2001 From: ilitteri Date: Mon, 6 May 2024 21:53:20 -0300 Subject: [PATCH 2/5] Fix From> and From> --- prover/prover_cli/src/commands/status/utils.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/prover/prover_cli/src/commands/status/utils.rs b/prover/prover_cli/src/commands/status/utils.rs index 73daffbba61..729135eecf7 100644 --- a/prover/prover_cli/src/commands/status/utils.rs +++ b/prover/prover_cli/src/commands/status/utils.rs @@ -135,9 +135,9 @@ impl From> for TaskStatus { .iter() .all(|job| matches!(job.status, ProverJobStatus::InProgress(_))) { - TaskStatus::Successful - } else { TaskStatus::InProgress + } else { + TaskStatus::Successful } } } @@ -175,9 +175,9 @@ impl From> for TaskStatus { .iter() .all(|job| matches!(job, WitnessJobStatus::InProgress)) { - TaskStatus::Successful - } else { TaskStatus::InProgress + } else { + TaskStatus::Successful } } } From 7cec39e433e5caeccd14a405e24f025893261da8 Mon Sep 17 00:00:00 2001 From: ilitteri Date: Tue, 7 May 2024 09:28:06 -0300 Subject: [PATCH 3/5] Fix batch data recursion tip default --- prover/prover_cli/src/commands/status/utils.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prover/prover_cli/src/commands/status/utils.rs b/prover/prover_cli/src/commands/status/utils.rs index 729135eecf7..e95d6f0a6f7 100644 --- a/prover/prover_cli/src/commands/status/utils.rs +++ b/prover/prover_cli/src/commands/status/utils.rs @@ -78,7 +78,7 @@ impl Default for BatchData { recursion_tip: Task::RecursionTip { status: TaskStatus::default(), aggregation_round_info: AggregationRoundInfo { - round: AggregationRound::Scheduler, + round: AggregationRound::RecursionTip, prover_jobs_status: TaskStatus::default(), }, }, From aaeea389ab90489075ae453bd72a0e3da0b261ea Mon Sep 17 00:00:00 2001 From: ilitteri Date: Tue, 7 May 2024 10:19:11 -0300 Subject: [PATCH 4/5] Print InGPUProof status as Custom --- prover/prover_cli/src/commands/status/utils.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/prover/prover_cli/src/commands/status/utils.rs b/prover/prover_cli/src/commands/status/utils.rs index e95d6f0a6f7..31ce61c5bea 100644 --- a/prover/prover_cli/src/commands/status/utils.rs +++ b/prover/prover_cli/src/commands/status/utils.rs @@ -126,6 +126,11 @@ impl From> for TaskStatus { fn from(jobs_vector: Vec) -> Self { if jobs_vector.is_empty() { TaskStatus::JobsNotFound + } else if jobs_vector + .iter() + .all(|job| matches!(job.status, ProverJobStatus::InGPUProof)) + { + TaskStatus::Custom("In GPU ⚡️".to_owned()) } else if jobs_vector .iter() .all(|job| matches!(job.status, ProverJobStatus::Queued)) From 6ae54a4efd81904aa08448e09b155cf68e45d4f4 Mon Sep 17 00:00:00 2001 From: ilitteri Date: Tue, 7 May 2024 10:30:37 -0300 Subject: [PATCH 5/5] Fix `From>` and `From>` --- prover/prover_cli/src/commands/status/utils.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/prover/prover_cli/src/commands/status/utils.rs b/prover/prover_cli/src/commands/status/utils.rs index 31ce61c5bea..fcff53f087c 100644 --- a/prover/prover_cli/src/commands/status/utils.rs +++ b/prover/prover_cli/src/commands/status/utils.rs @@ -138,11 +138,11 @@ impl From> for TaskStatus { TaskStatus::Queued } else if jobs_vector .iter() - .all(|job| matches!(job.status, ProverJobStatus::InProgress(_))) + .all(|job| matches!(job.status, ProverJobStatus::Successful(_))) { - TaskStatus::InProgress - } else { TaskStatus::Successful + } else { + TaskStatus::InProgress } } } @@ -178,11 +178,11 @@ impl From> for TaskStatus { TaskStatus::WaitingForProofs } else if status_vector .iter() - .all(|job| matches!(job, WitnessJobStatus::InProgress)) + .all(|job| matches!(job, WitnessJobStatus::Successful(_))) { - TaskStatus::InProgress - } else { TaskStatus::Successful + } else { + TaskStatus::InProgress } } }