dm e2e outputs added (#21210)

* try this

* use e2e only

* add new outputs

* Revert "use e2e only"

This reverts commit 423dd8e29b.

* send new

* fix batchnorm
old-commit-hash: 46e3f4528f

cereal

@@ -1 +1 @@
-Subproject commit cde8667d3bacb71d324b06b3d803c8fd7c59d2db
+Subproject commit 018e7b5c9bd1ea65baf98326f8c95f849551d5c0

models/dmonitoring_model.current

@@ -1,2 +1,2 @@
 6272770f-5230-4a10-ae5e-c8f3d205ea96
-0087a1181516dd0c64d7f7a58d53905e2cc76b72
+abbc836aaa1e940c56673b6f42f5762ad71b35e1

models/dmonitoring_model.onnx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6c9c3929d230dbf74cf1c601f217405774204ccbb37219942aa62ab50b3ad1a8
+oid sha256:ee9a4453c8c704bc510410b2cc6bac647e8cf9a1758e56247ee283ed5e60020a
-size 3790368
+size 8970731

models/dmonitoring_model_q.dlc

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ac23c84799c40e84a0337f6a424a541bbd7fd11604e509134712d4f2a07fa95
+oid sha256:ddc09891aac9746bc2fe63dc10e1757a02c7a4589c9fc4c1c7ed07298a1e3107
-size 1067993
+size 2374030

selfdrive/modeld/models/dmonitoring.cc

@@ -162,6 +162,8 @@ DMonitoringResult dmonitoring_eval_frame(DMonitoringModelState* s, void* stream_
   ret.partial_face = s->output[35];
   ret.distracted_pose = s->output[36];
   ret.distracted_eyes = s->output[37];
+  ret.eyes_on_road = s->output[38];
+  ret.phone_use = s->output[39];
   ret.dsp_execution_time = (t2 - t1) / 1000.;
   return ret;
 }
@@ -188,6 +190,8 @@ void dmonitoring_publish(PubMaster &pm, uint32_t frame_id, const DMonitoringResu
   framed.setPartialFace(res.partial_face);
   framed.setDistractedPose(res.distracted_pose);
   framed.setDistractedEyes(res.distracted_eyes);
+  framed.setEyesOnRoad(res.eyes_on_road);
+  framed.setPhoneUse(res.phone_use);
   if (send_raw_pred) {
     framed.setRawPredictions(raw_pred.asBytes());
   }

selfdrive/modeld/models/dmonitoring.h

@@ -7,7 +7,7 @@
 #include "selfdrive/modeld/models/commonmodel.h"
 #include "selfdrive/modeld/runners/run.h"
 
-#define OUTPUT_SIZE 38
+#define OUTPUT_SIZE 40
 
 typedef struct DMonitoringResult {
   float face_orientation[3];
@@ -24,6 +24,8 @@ typedef struct DMonitoringResult {
   float partial_face;
   float distracted_pose;
   float distracted_eyes;
+  float eyes_on_road;
+  float phone_use;
   float dsp_execution_time;
 } DMonitoringResult;