phonelibs -> third_party (#22477)

* git mv to third_party

* find and replace

* fix release tests

* update pre-commit

* update tici bins

* update eon bins

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: 5b641379ae
This commit is contained in:
Adeeb Shihadeh
2021-10-07 16:32:44 -07:00
committed by GitHub
parent 9c04514185
commit 782d7023d2
1290 changed files with 87984 additions and 1651 deletions

View File

@@ -49,7 +49,7 @@ jobs:
cp Dockerfile.openpilot_base $STRIPPED_DIR
# need this to build on x86
cp -pR --parents phonelibs/libyuv phonelibs/snpe selfdrive/modeld/runners $STRIPPED_DIR
cp -pR --parents third_party/libyuv third_party/snpe selfdrive/modeld/runners $STRIPPED_DIR
- name: Build Docker image
run: eval "$BUILD"
- name: Build openpilot and run checks

View File

@@ -38,7 +38,7 @@ repos:
entry: cppcheck
language: system
types: [c++]
exclude: '^(phonelibs)|(pyextra)|(cereal)|(opendbc)|(panda)|(tools)|(selfdrive/modeld/thneed/debug)|(selfdrive/modeld/test)|(selfdrive/camerad/test)/|(installer)'
exclude: '^(third_party)|(pyextra)|(cereal)|(opendbc)|(panda)|(tools)|(selfdrive/modeld/thneed/debug)|(selfdrive/modeld/test)|(selfdrive/camerad/test)/|(installer)'
args:
- --error-exitcode=1
- --language=c++

View File

@@ -16,7 +16,7 @@ RUN pip install --no-cache-dir pipenv==2020.8.13 && \
COPY SConstruct ${OPENPILOT_PATH}
COPY ./pyextra ${OPENPILOT_PATH}/pyextra
COPY ./phonelibs ${OPENPILOT_PATH}/phonelibs
COPY ./third_party ${OPENPILOT_PATH}/third_party
COPY ./site_scons ${OPENPILOT_PATH}/site_scons
COPY ./laika ${OPENPILOT_PATH}/laika
COPY ./laika_repo ${OPENPILOT_PATH}/laika_repo

View File

@@ -97,8 +97,8 @@ Directory Structure
├── docs # Documentation
├── opendbc # Files showing how to interpret data from cars
├── panda # Code used to communicate on CAN
├── phonelibs # External libraries
├── pyextra # Extra python packages not shipped in NEOS
├── third_party # External libraries
├── pyextra # Extra python packages
└── selfdrive # Code needed to drive the car
├── assets # Fonts, images, and sounds for UI
├── athena # Allows communication with the app

View File

@@ -64,11 +64,11 @@ USE_FRAME_STREAM = os.getenv("USE_FRAME_STREAM") is not None
lenv = {
"PATH": os.environ['PATH'],
"LD_LIBRARY_PATH": [Dir(f"#phonelibs/acados/{arch}/lib").abspath],
"LD_LIBRARY_PATH": [Dir(f"#third_party/acados/{arch}/lib").abspath],
"PYTHONPATH": Dir("#").abspath + ":" + Dir("#pyextra/").abspath,
"ACADOS_SOURCE_DIR": Dir("#phonelibs/acados/acados").abspath,
"TERA_PATH": Dir("#").abspath + f"/phonelibs/acados/{arch}/t_renderer",
"ACADOS_SOURCE_DIR": Dir("#third_party/acados/acados").abspath,
"TERA_PATH": Dir("#").abspath + f"/third_party/acados/{arch}/t_renderer",
}
rpath = lenv["LD_LIBRARY_PATH"].copy()
@@ -82,7 +82,7 @@ if arch == "aarch64" or arch == "larch64":
lenv["ANDROID_ROOT"] = os.environ['ANDROID_ROOT']
cpppath = [
"#phonelibs/opencl/include",
"#third_party/opencl/include",
]
libpath = [
@@ -90,14 +90,14 @@ if arch == "aarch64" or arch == "larch64":
"/usr/lib",
"/system/vendor/lib64",
"/system/comma/usr/lib",
"#phonelibs/nanovg",
f"#phonelibs/acados/{arch}/lib",
"#third_party/nanovg",
f"#third_party/acados/{arch}/lib",
]
if arch == "larch64":
libpath += [
"#phonelibs/snpe/larch64",
"#phonelibs/libyuv/larch64/lib",
"#third_party/snpe/larch64",
"#third_party/libyuv/larch64/lib",
"/usr/lib/aarch64-linux-gnu"
]
cpppath += [
@@ -109,8 +109,8 @@ if arch == "aarch64" or arch == "larch64":
else:
rpath = []
libpath += [
"#phonelibs/snpe/aarch64",
"#phonelibs/libyuv/lib",
"#third_party/snpe/aarch64",
"#third_party/libyuv/lib",
"/system/vendor/lib64"
]
cflags = ["-DQCOM", "-D_USING_LIBCXX", "-mcpu=cortex-a57"]
@@ -123,7 +123,7 @@ else:
if arch == "Darwin":
yuv_dir = "mac" if real_arch != "arm64" else "mac_arm64"
libpath = [
f"#phonelibs/libyuv/{yuv_dir}/lib",
f"#third_party/libyuv/{yuv_dir}/lib",
"/usr/local/lib",
"/opt/homebrew/lib",
"/usr/local/opt/openssl/lib",
@@ -139,10 +139,10 @@ else:
]
else:
libpath = [
"#phonelibs/acados/x86_64/lib",
"#phonelibs/snpe/x86_64-linux-clang",
"#phonelibs/libyuv/x64/lib",
"#phonelibs/mapbox-gl-native-qt/x86_64",
"#third_party/acados/x86_64/lib",
"#third_party/snpe/x86_64-linux-clang",
"#third_party/libyuv/x64/lib",
"#third_party/mapbox-gl-native-qt/x86_64",
"#cereal",
"#selfdrive/common",
"/usr/lib",
@@ -150,7 +150,7 @@ else:
]
rpath += [
Dir("#phonelibs/snpe/x86_64-linux-clang").abspath,
Dir("#third_party/snpe/x86_64-linux-clang").abspath,
Dir("#cereal").abspath,
Dir("#selfdrive/common").abspath
]
@@ -191,25 +191,25 @@ env = Environment(
CPPPATH=cpppath + [
"#",
"#phonelibs/acados/include",
"#phonelibs/acados/include/blasfeo/include",
"#phonelibs/acados/include/hpipm/include",
"#phonelibs/catch2/include",
"#phonelibs/bzip2",
"#phonelibs/libyuv/include",
"#phonelibs/openmax/include",
"#phonelibs/json11",
"#phonelibs/curl/include",
"#phonelibs/libgralloc/include",
"#phonelibs/android_frameworks_native/include",
"#phonelibs/android_hardware_libhardware/include",
"#phonelibs/android_system_core/include",
"#phonelibs/linux/include",
"#phonelibs/snpe/include",
"#phonelibs/mapbox-gl-native-qt/include",
"#phonelibs/nanovg",
"#phonelibs/qrcode",
"#phonelibs",
"#third_party/acados/include",
"#third_party/acados/include/blasfeo/include",
"#third_party/acados/include/hpipm/include",
"#third_party/catch2/include",
"#third_party/bzip2",
"#third_party/libyuv/include",
"#third_party/openmax/include",
"#third_party/json11",
"#third_party/curl/include",
"#third_party/libgralloc/include",
"#third_party/android_frameworks_native/include",
"#third_party/android_hardware_libhardware/include",
"#third_party/android_system_core/include",
"#third_party/linux/include",
"#third_party/snpe/include",
"#third_party/mapbox-gl-native-qt/include",
"#third_party/nanovg",
"#third_party/qrcode",
"#third_party",
"#cereal",
"#opendbc/can",
],
@@ -224,7 +224,7 @@ env = Environment(
CXXFLAGS=["-std=c++1z"] + cxxflags,
LIBPATH=libpath + [
"#cereal",
"#phonelibs",
"#third_party",
"#opendbc/can",
"#selfdrive/boardd",
"#selfdrive/common",
@@ -403,7 +403,7 @@ SConscript(['cereal/SConscript'])
SConscript(['panda/board/SConscript'])
SConscript(['opendbc/can/SConscript'])
SConscript(['phonelibs/SConscript'])
SConscript(['third_party/SConscript'])
SConscript(['common/SConscript'])
SConscript(['common/kalman/SConscript'])

View File

@@ -1,7 +1,7 @@
path_classifiers:
library:
- external
- phonelibs
- third_party
- pyextra
- tools/lib/mkvparse
extraction:

Binary file not shown.

BIN
phonelibs/acados/.gitignore LFS vendored

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

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

View File

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

View File

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

View File

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

Some files were not shown because too many files have changed in this diff Show More