From 70f0059be4e9fe10f0c78e3b35baa7f70ed0e9cc Mon Sep 17 00:00:00 2001
From: HaraldSchafer <harald.the.engineer@gmail.com>
Date: Tue, 29 Jun 2021 23:29:06 -0500
Subject: [PATCH] Revert DM model change (#21442)

* Revert "tici patch"

This reverts commit 09de331f18c7460ab4e939a245256ca69f765224.

* Revert "dm e2e outputs added (#21210)"

This reverts commit 46e3f4528fd0dc38e6da73843ebc85cefb926f74.

* Revert "improved dm model (#21113)"

This reverts commit 0f48fddf41cc7e5e63878b6bd584fc091482eb1b.
---
 models/dmonitoring_model.current       | 4 ++--
 models/dmonitoring_model.onnx          | 4 ++--
 models/dmonitoring_model_q.dlc         | 4 ++--
 selfdrive/modeld/models/dmonitoring.cc | 4 ----
 selfdrive/modeld/models/dmonitoring.h  | 4 +---
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/models/dmonitoring_model.current b/models/dmonitoring_model.current
index ba204b28c9..7ba21c3a96 100644
--- a/models/dmonitoring_model.current
+++ b/models/dmonitoring_model.current
@@ -1,2 +1,2 @@
-8156344d-623c-4d0b-88bc-46f648e34c23
-85e027177b7532c377dd07a2e20de2acfe8364f6
\ No newline at end of file
+3d4f9cab-ba54-4871-9449-37f440329ca1
+2d400e7514d044cd6cfc1fbafb756e04bb161d0a
\ No newline at end of file
diff --git a/models/dmonitoring_model.onnx b/models/dmonitoring_model.onnx
index 1993bdfd2a..6f5abbd71f 100644
--- a/models/dmonitoring_model.onnx
+++ b/models/dmonitoring_model.onnx
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d806d2209a5fb9b0fe1e9a9d90d90f625db52d83177bd35ff61c882d145c8a86
-size 9083205
+oid sha256:d70becdef7bd4e8406675312556f205e22f4d4be66ac84361664b295b2c01695
+size 4452109
diff --git a/models/dmonitoring_model_q.dlc b/models/dmonitoring_model_q.dlc
index 9949d4587c..0fa5dd0296 100644
--- a/models/dmonitoring_model_q.dlc
+++ b/models/dmonitoring_model_q.dlc
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cd3537efbd6afc76b61b8e52763443345718d8456c1b375b0273b800ec6704a0
-size 2374222
+oid sha256:709780fe17318c30d63cbf883952f556a5e4ba4fc5a9029425895847f0dcecc2
+size 1221118
diff --git a/selfdrive/modeld/models/dmonitoring.cc b/selfdrive/modeld/models/dmonitoring.cc
index af6b4ef9f1..075889caac 100644
--- a/selfdrive/modeld/models/dmonitoring.cc
+++ b/selfdrive/modeld/models/dmonitoring.cc
@@ -162,8 +162,6 @@ 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;
 }
@@ -190,8 +188,6 @@ 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());
   }
diff --git a/selfdrive/modeld/models/dmonitoring.h b/selfdrive/modeld/models/dmonitoring.h
index b16d86474b..2a134b7b6b 100644
--- a/selfdrive/modeld/models/dmonitoring.h
+++ b/selfdrive/modeld/models/dmonitoring.h
@@ -7,7 +7,7 @@
 #include "selfdrive/modeld/models/commonmodel.h"
 #include "selfdrive/modeld/runners/run.h"
 
-#define OUTPUT_SIZE 40
+#define OUTPUT_SIZE 38
 
 typedef struct DMonitoringResult {
   float face_orientation[3];
@@ -24,8 +24,6 @@ typedef struct DMonitoringResult {
   float partial_face;
   float distracted_pose;
   float distracted_eyes;
-  float eyes_on_road;
-  float phone_use;
   float dsp_execution_time;
 } DMonitoringResult;