diff --git a/cereal/log.capnp b/cereal/log.capnp index 75df44edec..87be2ceb99 100644 --- a/cereal/log.capnp +++ b/cereal/log.capnp @@ -933,7 +933,6 @@ struct ModelDataV2 { frameDropPerc @2 :Float32; timestampEof @3 :UInt64; modelExecutionTime @15 :Float32; - gpuExecutionTime @17 :Float32; rawPredictions @16 :Data; # predicted future position, orientation, etc.. @@ -960,12 +959,13 @@ struct ModelDataV2 { # Model perceived motion temporalPose @21 :Pose; + # e2e lateral planner + action @26: Action; + + gpuExecutionTimeDEPRECATED @17 :Float32; navEnabledDEPRECATED @22 :Bool; locationMonoTimeDEPRECATED @24 :UInt64; - - # e2e lateral planner lateralPlannerSolutionDEPRECATED @25: LateralPlannerSolution; - action @26: Action; struct LeadDataV2 { prob @0 :Float32; # probability that car is your lead at time t diff --git a/tools/latencylogger/README.md b/tools/latencylogger/README.md index 24169dfaef..110970308a 100644 --- a/tools/latencylogger/README.md +++ b/tools/latencylogger/README.md @@ -51,7 +51,7 @@ Frame ID: 1202 Execution finished 63.002552 modelV2 published 63.148747 modelV2.modelExecutionTime 23.62649142742157 - modelV2.gpuExecutionTime 0.0 + modelV2.gpuExecutionTimeDEPRECATED 0.0 plannerd longitudinalPlan published 69.715999 longitudinalPlan.solverExecutionTime 0.5619999719783664 diff --git a/tools/latencylogger/latency_logger.py b/tools/latencylogger/latency_logger.py index f145cc35e4..32df0da4b5 100755 --- a/tools/latencylogger/latency_logger.py +++ b/tools/latencylogger/latency_logger.py @@ -23,7 +23,7 @@ MSGQ_TO_SERVICE = { } SERVICE_TO_DURATIONS = { 'camerad': ['processingTime'], - 'modeld': ['modelExecutionTime', 'gpuExecutionTime'], + 'modeld': ['modelExecutionTime', 'gpuExecutionTimeDEPRECATED'], 'plannerd': ['solverExecutionTime'], }