larch64 modeld fixes (#2086)

5 years ago · cd6ec8211c
parent 5782efe3ae
commit cd6ec8211c
2 changed files with 6 additions and 2 deletions
--- a/selfdrive/modeld/modeld
+++ b/selfdrive/modeld/modeld
@ -1,4 +1,8 @@
 #!/bin/sh
-export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64/:$HOME/openpilot/phonelibs/snpe/larch64:$HOME/openpilot/phonelibs/snpe/x86_64-linux-clang:$LD_LIBRARY_PATH"
+if [ -d /system ]; then
+  export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64/:$LD_LIBRARY_PATH"
+else
+  export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/larch64:$HOME/openpilot/phonelibs/snpe/x86_64-linux-clang:$LD_LIBRARY_PATH"
+fi
 exec ./_modeld

--- a/selfdrive/modeld/modeld.cc
+++ b/selfdrive/modeld/modeld.cc
@ -98,7 +98,7 @@ int main(int argc, char **argv) {
  PubMaster pm({"model", "cameraOdometry"});
  SubMaster sm({"pathPlan", "frame"});

-#ifdef QCOM
+#if defined(QCOM) || defined(QCOM2)
  cl_device_type device_type = CL_DEVICE_TYPE_DEFAULT;
 #else
  cl_device_type device_type = CL_DEVICE_TYPE_CPU;