Commit Graph

968 Commits

Author SHA1 Message Date
Shane Smiskol 9f395d26d2 regen: send wideRoadCameraState (#24863)
* fix camera malfunction

* revert

* send in one process to fix frames out of sync

* not used

* revert

* fix and add --no-upload for CI testing

* fingerprint if source is fw

* no FW versions
old-commit-hash: 5dce006a82879f133ab69355b6c9b8c74d2b4d33
2022-06-16 22:41:13 -07:00
HaraldSchafer b0b1aff5cc Rocket league model (#24869)
* dd9a502d-c8e2-4831-b365-804b0ae0739d/600 80041070-d276-4fed-bdb9-0075e5442908/420

* no elementwise op

* 9dabf0fe-2e60-44bf-8d3a-d20a74aca072/600 ae746590-0bb5-4a16-80db-15f02d314f03/300 c4663a12-b499-4c9b-90dd-b169e3948cb1/60

* explicit slice

* some copies are useful

* 1456d261-d232-4654-8885-4d9fde883894/440 c06eba55-1931-4e00-9d63-acad00161be0/700 af2eb6ba-1935-4318-aaf8-868db81a4932/425

* 154f663e-d3e9-4020-ad49-0e640588ebbe/399 badb5e69-504f-4544-a99e-ba75ed204b74/800 08330327-7663-4874-af7a-dcbd2c994ba7/800

* set steer rate cost to 1.0

* smaller temporal size

* Update model reg

* update model ref again

* This did upload somehow

* Update steer rate cost

Co-authored-by: Yassine Yousfi <yyousfi1@binghamton.edu>
old-commit-hash: 9283040d847b120fdf7759d5bd12000863e12f73
2022-06-15 15:29:42 -07:00
Harald Schafer 07c859d384 Revert "Update model ref"
This reverts commit de5133d5378448a18e1e829ac2136cba07f4e346.

old-commit-hash: c851cf737931cba16909b2fe20ffec4858acd374
2022-06-15 11:33:59 -07:00
Harald Schafer 1d4ba4670b Update model ref
old-commit-hash: efc8aa05b4573f9ac96d518fbf04b6d799e487d0
2022-06-15 11:32:26 -07:00
Shane Smiskol 87b6182aac regen & process replay: support no disengage on accelerator (#24850)
* ACC on if enabled != 0

* small regen clean up and add HONDA3

* fixes

* revert unneeded changes

* not used

* just alt exp

Co-authored-by: redacid95 <jonathanc.olivier@gmail.com>
old-commit-hash: b86ef0b70e81ef4e895d5102feb231dc3d43265f
2022-06-14 23:30:35 -07:00
HaraldSchafer 5e002bff96 Torque control: low speed boost (#24859)
* Make very low speed more aggressive

* Less extreme low speed boost

* Update ref
old-commit-hash: a6652a539d8d4ba614b216900c472cc9e2e58a05
2022-06-14 22:29:08 -07:00
George Hotz 33bed6d13b remove weights fixup with new SNPE (#24254)
* remove weights fixup with new SNPE

* Update ref

Co-authored-by: Comma Device <device@comma.ai>
Co-authored-by: Harald Schafer <harald.the.engineer@gmail.com>
old-commit-hash: 7a6f57a28e6efda72319fc0b2a4873bcf7e06829
2022-06-14 15:46:03 -07:00
Shane Smiskol fda3609f6a process replay: clean up common code (#24855)
* regen and process replay clean up

* test_fuzzy actually uses fingerprint hardcoding

fix

* revert

* revert

* this can be a url or path so just print full variable
old-commit-hash: 170ed3d761a58222a626c86b9706f9be4900d058
2022-06-14 12:03:30 -07:00
HaraldSchafer 539221df6c Move couple toyotas to torque table values (#24849)
* Move couple toyotas to torque table values

* Dont set for all cars yet

* Dont regress docs

* update ref
old-commit-hash: dbfe923ecc0e14a781a7f03646ccf885ab2fa47a
2022-06-13 19:08:09 -07:00
Joost Wooning 38f6e2726b ui: skip texture frame copy (#24700)
* ui_blit working

* simpler and working

* more believable that it's real

* working on device

* build on pc

* use hardware pc

* reduce cpu usage

* yuv conversion to EGL

* move everything to cameraview

* some cleanup

* more cleanup

* init array

* init images with std::map

* dont destroy images

* do destroy images

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: 1221aef233180a7d290ff813d2e2e53dbf87d586
2022-06-13 12:27:47 +02:00
Adeeb Shihadeh 3c48bc47b7 Move a bunch of stuff to system/ part 3 (#24829)
* move swaglog.py

* timezoned

* logmessaged

* version.py

* fix linter
old-commit-hash: 0fce5d90459b77bf2cfa70f55f322f0e1fb8d01c
2022-06-11 23:19:27 -07:00
Adeeb Shihadeh 9a45a3b99b Move selfdrive/hardware/ to system/ (#24725)
* move hardware to system/

* fix mypy
old-commit-hash: 1139fe507b01f34de9714c99228f411558b44231
2022-06-11 16:38:24 -07:00
HaraldSchafer bc679f735d Misc torque control fixes (#24801)
* Fiction compensation should be based on error

* Update refs

* Add deadzone

* update ref
old-commit-hash: 843e59f6f0be33e6c51a35ef8912f5b7c4b58ca5
2022-06-10 22:52:48 -07:00
HaraldSchafer f7edd5f3d3 Car interface: set max lateral torque from table (#24789)
* json

* better naem

* Read from table

* formatting and default to nan

* Generate docs

* Read from table

* this should be the same

* Prius v is full

* test we always set the tunes correctly

add to release files

* Set for all cars

Set for all cars

* Revert tuning changes

Revert tuning changes

* remove that

* fixes

* update ref commit for new maxLateralAccels

Co-authored-by: Shane Smiskol <shane@smiskol.com>
old-commit-hash: 3066ad81a8b2f89a22ddfc86a879395c573ce0f5
2022-06-10 17:57:23 -07:00
ZwX1616 c73d4e5fc6 Revert fullframe DM model (#24812)
* Revert "fullframe DM: flip RHD yaw to use matching thresholds"

This reverts commit ce7daabc8847d18ba46e5d1879f5a6958d04ccc7.

* Revert "fullframe DM model (#24762)"

This reverts commit 817be81fb19004f4873881f6b29dcdfffbe7e3a8.

* revert cereal
old-commit-hash: c646eeee0ac54925db5afc51b95c5d869d6dba68
2022-06-10 16:16:46 -07:00
Shane Smiskol 68e8173474 docs: adjust steering torque thresholds (#24798)
* Prius has good steering control now

* 1.5 is the threshold for good torque

* get back down there, hondas

* half stars for 1.0-1.5

* show number of cars

* try bigger

* emphasize tiers

balanced

* Add half star

* Update ref_commit
old-commit-hash: 1b402687e4bb7146a9aa0c92d8b5062ce53aeb22
2022-06-09 18:51:34 -07:00
ZwX1616 02f0f39b52 fullframe DM model (#24762)
* get log

* simplify two nonsense

* not needed

* libyuv is a joke

* clean up

* try small

* fast but not bad

* working

* clean up driverview

* simplified

* thats mirrored

* smol

* tweak

* ref is screen

* w/ ee

* update camera model

* no if TICI

* start

* update pose thresh

* less cpu more dsp

* new libyuv

* new snpe

* add files

* test

* should be fast

* update out len

* trigger test

* use master snpe

* add cereal

* update cereal

* refactor parsing

* missing ;

* get

* wrong type

* test model

* use driver data

* 10829278-72fe-4283-a118-2cef959ce174/1550

* no pf

* adapt driverview

* ;

* rhd learner

* update libyuv buildi x64

* ad4337ea

* remove blink slack

* test

* no

* use toggle

* b16

* fix for nv12

* 5b02cff5 both

* update test

* update cereal

* update cereal

* update cereal

* v2 packets

* revert libyuv

* no /

* update snpemodel

* ;

* memcpy

* fix test

* use toggle in driverview

* update power

* update replay

* Revert "update replay"

This reverts commit 1d0979ca59dbc89bc5890656e9501e83f0556d50.

* update model ref

* halve cpu

* fake 8bit onnx runner

* same thresh as report

* cereal master

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: d6c07a6b158595c1ab10256dc6eee4fbdf902379
2022-06-08 20:13:46 -07:00
Lukas Petersson 4171e45e9c process replay: regen in parallel (#24628)
* regen in parallel

* prefixes

* clean regen

* clean output

* tqdm loc

* del swp file

* add routes back

* cleanup

* disable tqdm

* unique dirs

* unique dirs

* outdir in regen_all

* formatting when played from other dirs

* prefix dongle id

* local disable_tqdm

* formatting

* bug fix

* dont spam fakedata

* 16 char fake dongle ids

* formatting

* formatting

* more descriptive dongle

* fix azure path

* couple more fixes

* handle failures nicely

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 397da56c85d4d4932d25435dcb1d57f2cd2d8c4b
2022-06-06 14:21:12 -07:00
Shane Smiskol 1a2bf8412c Car documentation: set steering torque star using car interface (#24709)
* Set good torque using torque controller tuning

* should be equal to

* save lateral accel to car params

* use maxLateralAccel

* always

* same convention

* nan will always evaluate to false

* The great good torque purge

* adjust default friction

* Add data for more cars

* adjust name

* Welcome back, guys. Only adjust good torque if maxLatAccel is set

* Update refs (1.7 is 1.7000001...)
old-commit-hash: c6bc03311c04bec31677170782d5f3e1f404c2a7
2022-06-03 17:41:20 -07:00
HaraldSchafer 08ad733229 Remove laneless toggle (#24738)
* Remove laneless toggle

* Update refs
old-commit-hash: 7f16e19f791d9f709b40e2ef9781b88eb930aa98
2022-06-03 14:04:14 -07:00
HaraldSchafer 7c4645f227 Fix onnx model replay (#24702)
* No more C2

* Add test

* Various fixups

* Use ONNXCPU

* rm prints

* LFS pull

* Use sim docker

* Try sim docker again

* Print counter

* Make sure it can fail

* Fails correctly

* comments

* Add more install to opencl base docker

* vim not needed in base
old-commit-hash: a2c6b30c982cc4b5ebea890ab7cdd937dea9b4fa
2022-06-03 10:43:09 -07:00
Lukas Petersson 35f277516e process replay: upload-only bug (#24722)
dont look for lr with upload only
old-commit-hash: 50a8b3058037351519c8bfa558527d225f0d97c6
2022-06-02 17:25:44 -07:00
Shane Smiskol 6e6f8422fc process replay: fix tested_cars
old-commit-hash: 6a21cc83ffdae067550542e8dad45ea0cc2fe2b4
2022-06-02 14:20:19 -07:00
Shane Smiskol 490a836dd6 process replay: fix updating refs (#24716)
fix updating refs
old-commit-hash: 90af436a121164a51da9fa48d093c29f738adf6a
2022-06-02 13:49:21 -07:00
Willem Melching 753045c73d less TICI when not needed (#24698)
* less TICI when not needed

* fix process replay

* move reading voltages into hw abstraction layer

* Update selfdrive/hardware/tici/hardware.h

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>

* Update selfdrive/hardware/hw.h

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>

* Update selfdrive/hardware/base.h

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>

* rename init function

* Update selfdrive/athena/athenad.py

Co-authored-by: Robbe Derks <robbe.derks@gmail.com>

* Update selfdrive/boardd/boardd.cc

* Apply suggestions from code review

* Update selfdrive/thermald/thermald.py

* update ref

* fix alert width if all cameras are bad

* add ecam to test_loggerd

* bump cereal

* bump cereal

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Co-authored-by: Robbe Derks <robbe.derks@gmail.com>
old-commit-hash: f49a9c9fd2100a4f1401a93d88064ddbbbd935c1
2022-06-02 15:20:51 +02:00
Lukas Petersson a16a20005b process replay: logreader as bytes (#24610)
* willem's changes

* classmethod for bytes

* submodules

* submodules

* Update tools/lib/logreader.py

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>

* add back files

* little cleanup

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 86f73a507e2dba56bc8c3a1e753818147fb0eb0f
2022-06-01 22:02:42 -07:00
ClockeNessMnstr eeccd04c11 process replay: only download used logs (#24661)
* only download wanted logs

* cleanup

* cache as an option

* cleanup

* Readme

* Revert "cache as an option"

This reverts commit 060ed4ade548696505e3185fc7d20f1897072ded.

* cleanup

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 3fb22c0289d1c108aa0a5eb2064e7d87cc997bb9
2022-06-01 21:46:45 -07:00
George Hotz 2a6ffaf71d nv12: encoderd avoids a full frame copy (#24519)
* rgb to nv12

* nv12 works (w memcpy)

* correct now

* no copy

* fix nv12 with fast debayer

* reverts of unused stuff

* ui use nv12

* comment out thumbnails for now

* rebase fix

* dm read nv12

* model read nv12

* fix ffmpeg encoder

* thumbnails from nv12

* replay to nv12

* python framereader support nv12

* remove hardcoded frame/buffer sizes

* fix build

* ffmpeg encoder fix buffers

* small cleanup

* reduce power usage test

* fix cpu usage test

* fix snapshot

* fix loggerd test

* bump cereal

Co-authored-by: Comma Device <device@comma.ai>
Co-authored-by: Joost Wooning <jwooning@gmail.com>
old-commit-hash: ea5b8cdfb10686c972d8d2bc1778e6e6567e45a9
2022-06-01 17:18:28 +02:00
Gijs Koning 6a53db981b Simulator: Speed up process by removing second camera (#24679)
* simulator: support running wide camera only

* proper frame id

* use param name that makes more sense

* do some cleanup

* Update tools/sim/bridge.py

Co-authored-by: Willem Melching <willem.melching@gmail.com>
old-commit-hash: b5aed2bf6781cd4d74d28f6f44d24737ec08f0db
2022-05-30 15:25:07 +02:00
HaraldSchafer f5a6a6dc77 Tssp prius torque control (#24669)
* use llk

* use steering sensor at low speed stil

* Try more simple

* rm prius tune

* updated ref
old-commit-hash: d708a134bdff9db5cc65491dd9129a709e30ad34
2022-05-27 10:21:02 -07:00
Shane Smiskol 222d8818d7 process replay: fix updating refs after regen (#24656)
* fix updating refs after regen

* match spacing

* same as before

* fix

* minimize diff

* update

* not used
old-commit-hash: dff70876c3a41e66f218b3ecd9849034482139c4
2022-05-26 00:39:33 -07:00
Adeeb Shihadeh 3e8625e50b visionipc python shim (#24660)
old-commit-hash: 32a9ccfc37d97e6692435153ac9f0fe72feb1e9f
2022-05-25 20:49:56 -07:00
Lukas Petersson afbdbc7c39 process replay: fix regen routes with migration (#24651)
* hacks to make routes work

* clean up

Co-authored-by: Shane Smiskol <shane@smiskol.com>
old-commit-hash: 7d06a366f7b6d7a20dcb5aeeb48dfa5061a7e54a
2022-05-24 20:00:55 -07:00
HaraldSchafer 39886246c9 Rerevert torque control (#24649)
* Revert "Revert torque control (#24565)"

This reverts commit 93f434d047a92366c4ccefeece86fe101ed98d02.

* Move tune out of car specific stuff

* Update ref commit
old-commit-hash: d9289721503976cd99ac90216c502a841988c1a6
2022-05-24 17:52:33 -07:00
Lukas Petersson 81af5dacdf process replay: update regen body route (#24648)
update to a preserved route
old-commit-hash: 3e975eb3aa02636aaf734f8268f23a3ba9391e04
2022-05-24 17:07:10 -07:00
Lukas Petersson bcc6ca0cf5 process replay: prefix setup in helper (#24636)
* prefix setup in helper

* context manager

* name change + none default

* skip checking prefix

* type hints + unset env
old-commit-hash: d6fb78b9a3e97f982d7aca0c635534732e939972
2022-05-24 12:33:59 -07:00
HaraldSchafer 55085a12db New model: better laneless (#24605)
* Fix ping pong

* Fix hugging: e6fd3a62-aa86-46d1-a414-19137ed1babc/800

* Remove lateral toggle

* a6da6265-1952-48dd-986b-2b5996dd2642/950

* Model replay commit

* Revert "Remove lateral toggle"

This reverts commit 69e57eb7e1a72e4bad5e12bcfded6ff431a21a0e.
old-commit-hash: 7da48ebdba5e3cf4c0b8078c934bee9a199f0280
2022-05-24 09:11:31 -07:00
Lukas Petersson d1e21cef79 process replay: support running in parallel (#24534)
* prefix params

* set env

* prefix in manager

* filesystem except

* dont delete manager folder

* Update selfdrive/common/params.h

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>

* debug same path

* remove cleanup + same default

* dont use filesystem lib

* param symlink path

* prefix helpers

* path

* dont delete d

* parallel loop

* refactor loop

* msgq

* clean msgs

* spelling

* nestable pool

* spelling

* logreaders in parallel

* bugfix

* assert msgq

* Update selfdrive/test/process_replay/test_processes.py

Co-authored-by: Shane Smiskol <shane@smiskol.com>

* Update selfdrive/test/process_replay/test_processes.py

Co-authored-by: Shane Smiskol <shane@smiskol.com>

* assert in cereal

* folder exists

* create dirs in test

* bump cereal

* Update selfdrive/test/process_replay/process_replay.py

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>

* PR feedback

* params path in basedir

* ref commit

* param path

* bugfix

* upload_only

* param path

* Update selfdrive/test/process_replay/process_replay.py

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>

* msgq path name

* python concurrency.features

* progress bar

* remove progress bar from compare logs

* Update selfdrive/test/process_replay/test_processes.py

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>

* Update selfdrive/test/process_replay/test_processes.py

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>

* defaultdict

* context manager

* update refs

* dont get logs if upload only

* upload refs in parallel

* cleanup

* Update selfdrive/test/process_replay/test_processes.py

Co-authored-by: Shane Smiskol <shane@smiskol.com>

* cleanup

* text

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Co-authored-by: Shane Smiskol <shane@smiskol.com>
old-commit-hash: 444d26582121550a371f14e17d614ba6984cc10a
2022-05-18 19:59:30 -07:00
HaraldSchafer 3494ec7bbd Revert "Joint model (#24521)" (#24581)
This reverts commit 9fc732468ee4d4fd135d679a919c748633f06d02.
old-commit-hash: e2e5378dd3dbcc35777495a578bd842ba3096fac
2022-05-18 10:56:45 -07:00
Adeeb Shihadeh 1d9d8d874b controlsd cpu has crept up
old-commit-hash: 3771ccc6550dfe4f0797bb249354f3f52cbf53a3
2022-05-17 19:42:58 -07:00
HaraldSchafer efa559f9be Revert torque control (#24565)
* torque reversal start

* Fix carmodel tests

* Update ref

* update ref

* Elif is better than if
old-commit-hash: 9f8b03753dbdb131fac7bdc021e841cb30b3bf2c
2022-05-17 19:00:57 -07:00
George Hotz 3ee5b1bf07 make debayer faster (#24557)
* remove local caching

* remove local caching

* reduce camerad power

* break stupid imx390 black level support

* handle edges

* now 13ms, vignetting is 'slightly' less correct

* halfs->floats and inlines, down to 12.9ms

* oops, fix float

* val from 12 is ushort

* don't decide vignetting in the debayer kernel

* 7.77 ms

* adding back black level support was free

* Revert "adding back black level support was free"

This reverts commit a841d17727886807a040dcf856ab22480fa93eff.

* minor

* rip out unused gain and black level, remove print

* save 150mW

* fix replay test

* fix top/bottom rows

* lame left right edge fix

Co-authored-by: Comma Device <device@comma.ai>
Co-authored-by: Joost Wooning <jwooning@gmail.com>
old-commit-hash: 72b52f8b7d74bf3ea6fe8bd4d59af1c44c83afdb
2022-05-17 10:18:36 -07:00
HaraldSchafer 78c2e16a03 Joint model (#24521)
* update models

* wip lanelines mhp parsing

* typos

* newer models

* 95995a49-db0c-4261-8776-b90780dc2a8c/600

* Use laneful policy to prevent planner aggression

* c8c3ab69-bd2c-4d1c-a7f8-9e8457e4827b/950

* ede8f75a-df3e-41fb-bc56-63e2f33858e5/950

* 7205c5af-7532-4215-ad9b-678789054db7/995

* bfb34fa3-1d72-4987-854f-43d42ee01015/950

* change cost

* 8ae2477a-b452-4601-b04c-d3af66ea5e98/950

* Update heading cost

* 9b991314-94f5-4f0b-872e-58d95266e4d0/333

* 9b991314-94f5-4f0b-872e-58d95266e4d0/950

* ede8f75a-df3e-41fb-bc56-63e2f33858e5/950

* undo lateral planner changes

* rm whitespace

* update ref

* c0acc19d-f2f1-47ae-8838-5382c6c6c7f5/950

* c0acc19d-f2f1-47ae-8838-5382c6c6c7f5/950

* update model refg

* Update model ref

Co-authored-by: Yassine Yousfi <yyousfi1@binghamton.edu>
old-commit-hash: 7996fd37ef127c76aa62afa27f97ad4898fe1898
2022-05-16 17:26:23 -07:00
Willem Melching 0a2c2a6b28 Add unittest for alert callbacks (#24551)
add alert callback test
old-commit-hash: 31af13101ba2ad3b6282140c70c07e5298ccffce
2022-05-16 16:25:52 +02:00
Joost Wooning 4b3954a21f debayering: update test ref commit
old-commit-hash: 2294fcdbe7c87cec6572f813e8f7f31e94841102
2022-05-16 13:37:16 +02:00
Adeeb Shihadeh 29a516bed8 replay: cleanup unused RGB buffers (#24537)
* replay: cleanup unused RGB buffers

* update replay cam

* little more
old-commit-hash: ab75c53792718d32e51d34336be3fae568051d2b
2022-05-14 19:55:12 -07:00
Shane Smiskol 874ba219dc Fix process replay regen (#24517)
* fix regen issues

* compress like uploader
old-commit-hash: d6c6275163fde581b9c32059561d2f720063e808
2022-05-14 19:53:08 -07:00
George Hotz a053d070be encoderd: enable (#24492)
* enable encoderd

* correct enable line

* fix loggerd tests

* fix power draw and cpu tests

* correct cpu for encoderd

* fix a bug, video_writer is shared

* fix issue with not recording dcam

* add recording state

* wooo tests pass. encode id keeps counting

* core 3

* loggerd then encoderd

* stop loggerd first

* core 3 always online

* see the camera when we see encoder packet

* encoderd on small core uses 37%

* remove encoder logic from loggerd

* delete unit test that doesn't really make sense anymore

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: 94b9972eb798408a3c412716b8d9eb8ddb9354bc
2022-05-13 17:56:02 -07:00
Joost Wooning da6d0d878a camerad: combine debayering and rgb_to_yuv opencl kernels (#24452)
* camerad: combine debayering and rgb_to_yuv opencl kernels

* fix border

* fix snapshot

* rename function

* update camerad cpu usage

* update camerad power draw

* vignetting equal to previously

* test other local worksize

* use less floats

* reduce amount of code

* move barrier back

* make faster

* fix corners

* cleanup

* cleanup

* allow more jitter on driverState timing

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: 489fbb74b0f532c738cf8c06afe1a5f9ce1e1651
2022-05-13 16:49:31 +02:00
Adeeb Shihadeh aefc73be1b Revert "Joint Model (#24213)"
This reverts commit f6aaafb8d9332c934373fc6fde27abd596b7049f.

old-commit-hash: ef81afc35488905b00f1a0a5d0c0fc36b2bc856f
2022-05-12 22:52:45 -07:00