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.

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

fix(Prover CLI): status batch bugs #1865

Merged
merged 25 commits into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
51d4ce3
Handle in_gpu_proof status
ilitteri May 6, 2024
d6abec6
Merge branch 'main' into prover_cli_fix_status_batch
ilitteri May 6, 2024
cedd9d0
Fix From<Vec<WitnessJobStatus>> and From<Vec<ProverJobFriInfo>>
ilitteri May 7, 2024
6252d2b
Merge branch 'prover_cli_fix_status_batch' of github.com:matter-labs/…
ilitteri May 7, 2024
7cec39e
Fix batch data recursion tip default
ilitteri May 7, 2024
b4f5b6c
Merge branch 'main' into prover_cli_fix_status_batch
ColoCarletti May 7, 2024
aaeea38
Print InGPUProof status as Custom
ilitteri May 7, 2024
1a47589
Merge branch 'prover_cli_fix_status_batch' of github.com:matter-labs/…
ilitteri May 7, 2024
6ae54a4
Fix `From<Vec<WitnessJobStatus>>` and `From<Vec<ProverJobFriInfo>>`
ilitteri May 7, 2024
68e3dee
Merge branch 'main' into prover_cli_fix_status_batch
ilitteri May 7, 2024
167102f
Merge branch 'main' into prover_cli_fix_status_batch
ilitteri May 7, 2024
b1847c0
Merge branch 'main' into prover_cli_fix_status_batch
ilitteri May 8, 2024
cd7e3ec
Merge branch 'main' into prover_cli_fix_status_batch
ilitteri May 8, 2024
f27a3dc
Merge branch 'main' into prover_cli_fix_status_batch
ilitteri May 8, 2024
38ee527
Merge branch 'main' into prover_cli_fix_status_batch
ilitteri May 8, 2024
026408c
Merge branch 'main' into prover_cli_fix_status_batch
ColoCarletti May 9, 2024
d6d1ce3
Merge branch 'main' into prover_cli_fix_status_batch
ilitteri May 10, 2024
d7cb3cd
Merge branch 'main' into prover_cli_fix_status_batch
ColoCarletti May 10, 2024
891c1a5
Merge branch 'main' into prover_cli_fix_status_batch
ilitteri May 13, 2024
a109d22
Merge branch 'main' into prover_cli_fix_status_batch
ilitteri May 13, 2024
aa5ed94
Merge branch 'main' into prover_cli_fix_status_batch
ilitteri May 13, 2024
b0faf1d
Merge branch 'main' into prover_cli_fix_status_batch
AnastasiiaVashchuk May 14, 2024
71f3663
Merge branch 'main' into prover_cli_fix_status_batch
Artemka374 May 14, 2024
0568638
Merge branch 'main' into prover_cli_fix_status_batch
Artemka374 May 14, 2024
97efe50
Merge branch 'main' into prover_cli_fix_status_batch
Artemka374 May 14, 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: 2 additions & 0 deletions core/lib/basic_types/src/prover_dal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
11 changes: 8 additions & 3 deletions prover/prover_cli/src/commands/status/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,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(),
},
},
Expand Down Expand Up @@ -120,14 +120,19 @@ impl From<Vec<ProverJobFriInfo>> for TaskStatus {
fn from(jobs_vector: Vec<ProverJobFriInfo>) -> 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))
{
TaskStatus::Queued
} else if jobs_vector
.iter()
.all(|job| matches!(job.status, ProverJobStatus::InProgress(_)))
.all(|job| matches!(job.status, ProverJobStatus::Successful(_)))
{
TaskStatus::Successful
} else {
Expand Down Expand Up @@ -167,7 +172,7 @@ impl From<Vec<WitnessJobStatus>> for TaskStatus {
TaskStatus::WaitingForProofs
} else if status_vector
.iter()
.all(|job| matches!(job, WitnessJobStatus::InProgress))
.all(|job| matches!(job, WitnessJobStatus::Successful(_)))
{
TaskStatus::Successful
} else {
Expand Down
Loading