diff --git a/.gitignore b/.gitignore index 6c5e7f8..6168f11 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ -# 特例列表 -!rknn_sdk + # Prerequisites *.d @@ -48,4 +47,8 @@ build_gyk/ build-gyk/ # Ignore Mosquitto runtime data and logs mosquitto/data/ -mosquitto/log/ \ No newline at end of file +mosquitto/log/ + +# 特例列表 +!rknn_sdk/librknn_api/aarch64/*.so +!rknn_sdk \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 263a2fe..3f13d99 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,7 @@ services: container_name: edge-proxy-shared-dev image: edge-proxy-edge-proxy-dev:latest platform: linux/arm64 + network_mode: "host" privileged: true devices: - /dev/ttyS7:/dev/ttyS7 @@ -29,6 +30,10 @@ services: - "9999:9999" - "502:502" - "8080:8080" + + dns: + - 8.8.8.8 + - 114.114.114.114 command: sleep infinity mqtt-broker: diff --git a/docker/Dockerfile b/docker/Dockerfile index cb3fa12..75f8d9a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -66,9 +66,14 @@ RUN cd /tmp/build-context/external/paho.mqtt.c && \ cmake --build build --target install && \ rm -rf /tmp/build-context -COPY rknn_sdk/rknn_server/aarch64/usr/bin/rknn_server /usr/bin/rknn_server/ +COPY rknn_sdk/librknn_api/include/rknn_api.h /usr/local/include/ +COPY rknn_sdk/rknn_server/aarch64/usr/bin/rknn_server /usr/bin/rknn_server COPY rknn_sdk/librknn_api/aarch64/librknnrt.so /usr/lib/librknnrt.so COPY rknn_sdk/librknn_api/aarch64/librknn_api.so /usr/lib/librknn_api.so +COPY rknn_sdk/whl/*.whl /tmp/rknn_wheels/ +RUN pip3 install /tmp/rknn_wheels/*.whl && \ + rm -rf /tmp/rknn_wheels +RUN chmod +x /usr/bin/rknn_server RUN ldconfig RUN rm -rf /var/lib/apt/lists/* diff --git a/rknn_sdk/librknn_api/aarch64/librknn_api.so b/rknn_sdk/librknn_api/aarch64/librknn_api.so new file mode 100644 index 0000000..7299993 --- /dev/null +++ b/rknn_sdk/librknn_api/aarch64/librknn_api.so @@ -0,0 +1 @@ +librknnrt.so \ No newline at end of file diff --git a/rknn_sdk/librknn_api/aarch64/librknnrt.so b/rknn_sdk/librknn_api/aarch64/librknnrt.so new file mode 100644 index 0000000..1a9dc54 Binary files /dev/null and b/rknn_sdk/librknn_api/aarch64/librknnrt.so differ diff --git a/rknn_sdk/rknpu2-1.5.2.zip b/rknn_sdk/rknpu2-1.5.2.zip deleted file mode 100644 index 6c06a68..0000000 Binary files a/rknn_sdk/rknpu2-1.5.2.zip and /dev/null differ diff --git a/rknn_sdk/whl/rknn_toolkit_lite2-2.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl b/rknn_sdk/whl/rknn_toolkit_lite2-2.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl new file mode 100644 index 0000000..98f2af0 Binary files /dev/null and b/rknn_sdk/whl/rknn_toolkit_lite2-2.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl differ