Preparing for the efficientnet (#1255)

* snpe version 1.35.0.698

* fix files common for new snpe

* efficient net with normal names

* compiling with 1.32 works

* actual snpe files

* fix monitoring, delete unneeded

* point the symlinks to the right places

* err, modeld needs the CPU

* benchmark for 50 its

* put back old model for now

Co-authored-by: Comma Device <device@comma.ai>
Co-authored-by: Harald Schafer <harald.the.engineer@gmail.com>
Co-authored-by: George Hotz <geohot@gmail.com>
old-commit-hash: 6e5a2d404b
commatwo_master
George Hotz 5 years ago committed by GitHub
parent b83968e399
commit 3f5d11ff3b
  1. 2
      phonelibs/snpe/aarch64
  2. 3
      phonelibs/snpe/aarch64-android-clang3.8/libSNPE.so
  3. 3
      phonelibs/snpe/aarch64-android-clang3.8/libsnpe_dsp_skel.so
  4. 3
      phonelibs/snpe/aarch64-android-clang3.8/libsymphony-cpu.so
  5. 3
      phonelibs/snpe/aarch64-android-clang3.8/libsymphonypower.so
  6. 3
      phonelibs/snpe/aarch64-android-clang6.0/libSNPE.so
  7. 3
      phonelibs/snpe/aarch64-android-clang6.0/libc++_shared.so
  8. 3
      phonelibs/snpe/aarch64-android-clang6.0/libsnpe_adsp.so
  9. 3
      phonelibs/snpe/aarch64-android-clang6.0/libsnpe_dsp_skel.so
  10. 3
      phonelibs/snpe/aarch64-android-clang6.0/libsymphony-cpu.so
  11. 4
      phonelibs/snpe/include/DiagLog/Options.hpp
  12. 4
      phonelibs/snpe/include/DlContainer/IDlContainer.hpp
  13. 4
      phonelibs/snpe/include/DlSystem/DlEnums.hpp
  14. 4
      phonelibs/snpe/include/DlSystem/DlError.hpp
  15. 4
      phonelibs/snpe/include/DlSystem/DlOptional.hpp
  16. 4
      phonelibs/snpe/include/DlSystem/IBufferAttributes.hpp
  17. 4
      phonelibs/snpe/include/DlSystem/IUserBuffer.hpp
  18. 4
      phonelibs/snpe/include/DlSystem/PlatformConfig.hpp
  19. 3
      phonelibs/snpe/include/DlSystem/RuntimeList.hpp
  20. 3
      phonelibs/snpe/include/SNPE/ApplicationBufferMap.hpp
  21. 3
      phonelibs/snpe/include/SNPE/PSNPE.hpp
  22. 3
      phonelibs/snpe/include/SNPE/RuntimeConfigList.hpp
  23. 4
      phonelibs/snpe/include/SNPE/SNPE.hpp
  24. 4
      phonelibs/snpe/include/SNPE/SNPEBuilder.hpp
  25. 4
      phonelibs/snpe/include/SNPE/SNPEFactory.hpp
  26. 3
      phonelibs/snpe/include/SNPE/UserBufferList.hpp
  27. 4
      phonelibs/snpe/x86_64-linux-clang/libSNPE.so
  28. 4
      phonelibs/snpe/x86_64-linux-clang/libsymphony-cpu.so
  29. 2
      release/files_common
  30. 4
      selfdrive/modeld/dmonitoringmodeld
  31. 2
      selfdrive/modeld/modeld
  32. 2
      selfdrive/modeld/test/snpe_benchmark/benchmark.cc

@ -1 +1 @@
aarch64-android-clang3.8 aarch64-android-clang6.0

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2df46d2204a3883ba2d3f4481d5d813982033a267ee69f239d146434ac0543a8
size 5227664

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:135c97e723b9eeef1a5a9fee7161044fd5153867571332fb599cbe79e97d13e8
size 810560

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:40990fbd09c217301cb5a89c20e401e1dcb9a86b99a7d9436cf2c995ad15952e
size 518000

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cf93a6e8ab2a1df4ab3fcac92b277489be8258682b7e15884b55f2b21bfacb29
size 54960

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:96c21bf93895afb1ba62416c4b7341439aeec679bfd81567bf8464ec5b5758fb
size 7919568

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cbf48c05fd429d280da9947a3e59623bc2918a4522e47335330b3fac8bc4c4e1
size 1055016

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7ac502fa06c2dc7bca7ba6a069e96111bd0d0ab8741c2c9fd2a9ff540de5f415
size 17728

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cc509048df51bc35816c169b3332d8895aebd64d096b7867e28bf337728f852b
size 1323392

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:42af709f7e21aae6611142feed95abbc4a8a1bf0791208a1b9648a53c162f8fb
size 563320

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:4fa35594e369531181b1220ed2bd7325d094e0696cf73e44a75f1e6860990978 oid sha256:ba4694b6a276b78aee0910ff3e000ea2d4b798810108bb6d7d7740c635bf7751
size 1970 size 2199

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:6ec37f2fd4a1faade856e14c24a58793d814e760c0b1fd239415dfcdaa244df1 oid sha256:128ec3503ae586e3d5dbc0fa0f1e38b5d82c89941c70df38cb725217cde6bd88
size 4417 size 5550

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:90826fdd6a086879193075030b167115c0427e7c6f04a4fa8c5bc7a8f574e394 oid sha256:c47b4366a436f6ee87afd5614a48eeaba84b11a3b922eb5d7c91fc3e35250b86
size 3949 size 5321

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:d248c9f13e1a5b65f366076d5aafb0d015ed44edb4eed0045695919ffe0587c0 oid sha256:aae17933ad93e558523fcb5bc21a383b021cb1d98ca7e61c067ae9f5ddb9a07e
size 8867 size 10905

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:8a8d1e54e652b32f7cd2c1b230c979e634bf91751c320d197c5cb0d152d717ba oid sha256:a5458c928570709a977ded32ee19d97382908051ca14a598317fb885ab7f6ea3
size 5867 size 5883

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:eab3540ef39b2187ad475c7d5138eef98e4dfba1b0f00934f472b75e9a41882f oid sha256:ba89ba4e8aef5b1a11ca3092f69ccb6435079d93a0eafc3d74fd78598d7a465a
size 1998 size 2384

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:b58f6e17d770d67438fc93c6c05612521b37fcc6f5939945eca5ab035e983c5e oid sha256:d61dcad19faf152bcd3a89b254a66df4f9a23f03f8b95e7de7cb13ea18549e52
size 7607 size 10844

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:eb06f287c7eb174bda7a64723b6aab395eeececd6d67f386f92b228e44552e3f oid sha256:3ada59af5b711dd1c5472b576a9776f13a3f6719fbbc86dd6a546737d79184cc
size 3873 size 4876

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:60bdf12976d8348b4eb285c72f86431ef5ade59452296ebb0de11e8a83da6df1
size 3146

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:51c26c448233f22b8f0058dc93b204f82e493fc36e784e1ac2c23f8c59b887e1
size 2805

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:707c9e363933da4eefed64470c309527fb13293fa8236ea8f59cb922b6f38cc4
size 4885

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c77d90e200f5477bf361066ee67eb7131dfccb6b13dd621b961f51ca3642d65c
size 2415

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:7de0a6ac247dd0733c6570110ab13ff5bf8aa12f3611a1fcfbcc39bd095758d3 oid sha256:9408fbc0ba974efd71b24ebc7a7a54dc1353c253e1089e30362c924e25975b63
size 8122 size 8348

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:ed0c2dea53b2fa092b3370321fb1f99893204e25e943a0bc2d151bddc0496fe2 oid sha256:39bdaaa1696e8fb3a726685bab4c9cd6f5d3f5df572673d310fa8f5367e2cd85
size 7192 size 10117

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:549be78486cbecaf16f42ece2b66bbc7c8cadd538c24e0ddbb25dd664bfaf42f oid sha256:f2d7eb817326862920e09224ede42691926458d3303b6c8f087317b4b33c954e
size 2603 size 3579

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c641ad042a19c9e71e8211cf76e38fb5e2a8a749203946f8179a268ad541d82d
size 1300

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:497d74dbb73862e4564cf210e117b2efa7a571a373aec5998c650b698e769eb0 oid sha256:d19249bec7b68412db78796e06adad5d49173dc1590aff472961ae89057fa176
size 4221408 size 5856568

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:1e66426d0d7c4550f77ec4e8576d0b8db9eeacb988e1ec3de0d970f38e7e7c40 oid sha256:e680b2a32b1f0f756624747ed0f9728f32442d0227384c41371426017e512ff9
size 492416 size 484048

@ -405,7 +405,7 @@ phonelibs/libyuv/include/**
phonelibs/libyuv/lib/** phonelibs/libyuv/lib/**
phonelibs/snpe/include/** phonelibs/snpe/include/**
phonelibs/snpe/aarch64-android-clang3.8/** phonelibs/snpe/aarch64**
phonelibs/fastcv/aarch64/** phonelibs/fastcv/aarch64/**

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64-android-clang3.8:$HOME/openpilot/phonelibs/snpe/x86_64-linux-clang:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64:$HOME/openpilot/phonelibs/snpe/x86_64-linux-clang:$LD_LIBRARY_PATH"
export ADSP_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64-android-clang3.8/" export ADSP_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64/"
exec ./_dmonitoringmodeld exec ./_dmonitoringmodeld

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64-android-clang3.8/:$HOME/openpilot/phonelibs/snpe/x86_64-linux-clang:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64/:$HOME/openpilot/phonelibs/snpe/x86_64-linux-clang:$LD_LIBRARY_PATH"
exec ./_modeld exec ./_modeld

@ -83,7 +83,7 @@ void test(char *filename) {
struct timespec start, end; struct timespec start, end;
cout << "**** starting benchmark ****" << endl; cout << "**** starting benchmark ****" << endl;
for (int i = 0; i < 10; i++) { for (int i = 0; i < 50; i++) {
clock_gettime(CLOCK_MONOTONIC, &start); clock_gettime(CLOCK_MONOTONIC, &start);
assert(snpe->execute(inputTensorMap, outputTensorMap)); assert(snpe->execute(inputTensorMap, outputTensorMap));
clock_gettime(CLOCK_MONOTONIC, &end); clock_gettime(CLOCK_MONOTONIC, &end);

Loading…
Cancel
Save