From 00ea7c1c8210201b31b73c2bf603b47d04bc5e37 Mon Sep 17 00:00:00 2001 From: ZwX1616 Date: Mon, 16 Aug 2021 12:44:45 -0700 Subject: [PATCH] DM 0.8.8 (#21897) * update threshs * e392 * 40% less * ref --- models/dmonitoring_model.current | 4 ++-- models/dmonitoring_model.onnx | 4 ++-- models/dmonitoring_model_q.dlc | 4 ++-- selfdrive/monitoring/driver_monitor.py | 20 ++++++++++---------- selfdrive/test/process_replay/ref_commit | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/models/dmonitoring_model.current b/models/dmonitoring_model.current index 7ba21c3a9..c9a70ac64 100644 --- a/models/dmonitoring_model.current +++ b/models/dmonitoring_model.current @@ -1,2 +1,2 @@ -3d4f9cab-ba54-4871-9449-37f440329ca1 -2d400e7514d044cd6cfc1fbafb756e04bb161d0a \ No newline at end of file +e3926f53-2a15-4a85-8143-dd120f19c050 +9208a645dc8f6b251d6fd5899b592243f71d815b \ No newline at end of file diff --git a/models/dmonitoring_model.onnx b/models/dmonitoring_model.onnx index e0fb693a4..3e0e8abe5 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:d0e105e31be410b3414996a1ad8b0a67612afe102d6df34130349e0db1a8c9bf -size 4454207 +oid sha256:dea2cce554f1f78919090f7ea93917ae6a319a8ef65f860b3a27026877ff55e7 +size 3902922 diff --git a/models/dmonitoring_model_q.dlc b/models/dmonitoring_model_q.dlc index 3c8eb7d38..cd28e6691 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:edadc831f5a86f0631a18b1e1e6d8f5ce83bf05f765777d27b276bb14adf6378 -size 1223592 +oid sha256:5d7e8593dd14966195b3fee08be5b53da41b5136f90a2ead8feaf09c3ae898e1 +size 1068176 diff --git a/selfdrive/monitoring/driver_monitor.py b/selfdrive/monitoring/driver_monitor.py index 09c8a7902..45379bc25 100644 --- a/selfdrive/monitoring/driver_monitor.py +++ b/selfdrive/monitoring/driver_monitor.py @@ -26,20 +26,20 @@ class DRIVER_MONITOR_SETTINGS(): self._DISTRACTED_PROMPT_TIME_TILL_TERMINAL = 6. self._FACE_THRESHOLD = 0.5 - self._PARTIAL_FACE_THRESHOLD = 0.75 if TICI else 0.5 - self._EYE_THRESHOLD = 0.5 - self._SG_THRESHOLD = 0.5 - self._BLINK_THRESHOLD = 0.88 if TICI else 0.6 - self._BLINK_THRESHOLD_SLACK = 0.98 if TICI else 0.78 - self._BLINK_THRESHOLD_STRICT = 0.88 if TICI else 0.6 + self._PARTIAL_FACE_THRESHOLD = 0.765 if TICI else 0.455 + self._EYE_THRESHOLD = 0.25 if TICI else 0.57 + self._SG_THRESHOLD = 0.83 + self._BLINK_THRESHOLD = 0.46 if TICI else 0.68 + self._BLINK_THRESHOLD_SLACK = 0.6 if TICI else 0.88 + self._BLINK_THRESHOLD_STRICT = 0.46 if TICI else 0.68 self._PITCH_WEIGHT = 1.175 if TICI else 1.35 # pitch matters a lot more - self._POSESTD_THRESHOLD = 0.318 if TICI else 0.14 + self._POSESTD_THRESHOLD = 0.2 if TICI else 0.175 self._E2E_POSE_THRESHOLD = 0.95 if TICI else 0.9 self._E2E_EYES_THRESHOLD = 0.75 - self._METRIC_THRESHOLD = 0.5 if TICI else 0.4 - self._METRIC_THRESHOLD_SLACK = 0.6875 if TICI else 0.55 - self._METRIC_THRESHOLD_STRICT = 0.5 if TICI else 0.4 + self._METRIC_THRESHOLD = 0.55 if TICI else 0.48 + self._METRIC_THRESHOLD_SLACK = 0.75 if TICI else 0.66 + self._METRIC_THRESHOLD_STRICT = 0.55 if TICI else 0.48 self._PITCH_POS_ALLOWANCE = 0.12 # rad, to not be too sensitive on positive pitch self._PITCH_NATURAL_OFFSET = 0.02 # people don't seem to look straight when they drive relaxed, rather a bit up self._YAW_NATURAL_OFFSET = 0.08 # people don't seem to look straight when they drive relaxed, rather a bit to the right (center of car) diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index 844b460df..cda4e3d8d 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -dfa788ebfb5a87a2c76c921cb0b54eaf39175071 \ No newline at end of file +d2523043434c35575f452be55783879058a49ae7 \ No newline at end of file