From 831aeda21db806b41bc90babf0a42ebef92fbbdc Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 2 Jul 2024 07:08:53 +0300 Subject: [PATCH] Added support for OPI5 build --- tmp/opi_rtsp/aiengine.cpp | 2 +- tmp/opi_rtsp/opi_rtsp.pro | 31 +++++------------- .../{ => src-onnx}/aiengineinferenceonnx.cpp | 0 .../{ => src-onnx}/aiengineinferenceonnx.h | 2 +- tmp/opi_rtsp/{pc => src-onnx}/inference.cpp | 0 tmp/opi_rtsp/{pc => src-onnx}/inference.h | 0 tmp/opi_rtsp/{opi5 => src-opi5}/bus.png | Bin tmp/opi_rtsp/{opi5 => src-opi5}/common.h | 0 tmp/opi_rtsp/{opi5 => src-opi5}/file_utils.c | 0 tmp/opi_rtsp/{opi5 => src-opi5}/file_utils.h | 0 tmp/opi_rtsp/{opi5 => src-opi5}/font.h | 0 .../{opi5 => src-opi5}/image_drawing.c | 0 .../{opi5 => src-opi5}/image_drawing.h | 0 tmp/opi_rtsp/{opi5 => src-opi5}/image_utils.c | 0 tmp/opi_rtsp/{opi5 => src-opi5}/image_utils.h | 0 .../{opi5 => src-opi5}/postprocess.cc | 0 tmp/opi_rtsp/{opi5 => src-opi5}/postprocess.h | 0 tmp/opi_rtsp/{opi5 => src-opi5}/yolov8.cc | 0 tmp/opi_rtsp/{opi5 => src-opi5}/yolov8.h | 0 19 files changed, 11 insertions(+), 24 deletions(-) rename tmp/opi_rtsp/{ => src-onnx}/aiengineinferenceonnx.cpp (100%) rename tmp/opi_rtsp/{ => src-onnx}/aiengineinferenceonnx.h (91%) rename tmp/opi_rtsp/{pc => src-onnx}/inference.cpp (100%) rename tmp/opi_rtsp/{pc => src-onnx}/inference.h (100%) rename tmp/opi_rtsp/{opi5 => src-opi5}/bus.png (100%) rename tmp/opi_rtsp/{opi5 => src-opi5}/common.h (100%) rename tmp/opi_rtsp/{opi5 => src-opi5}/file_utils.c (100%) rename tmp/opi_rtsp/{opi5 => src-opi5}/file_utils.h (100%) rename tmp/opi_rtsp/{opi5 => src-opi5}/font.h (100%) rename tmp/opi_rtsp/{opi5 => src-opi5}/image_drawing.c (100%) rename tmp/opi_rtsp/{opi5 => src-opi5}/image_drawing.h (100%) rename tmp/opi_rtsp/{opi5 => src-opi5}/image_utils.c (100%) rename tmp/opi_rtsp/{opi5 => src-opi5}/image_utils.h (100%) rename tmp/opi_rtsp/{opi5 => src-opi5}/postprocess.cc (100%) rename tmp/opi_rtsp/{opi5 => src-opi5}/postprocess.h (100%) rename tmp/opi_rtsp/{opi5 => src-opi5}/yolov8.cc (100%) rename tmp/opi_rtsp/{opi5 => src-opi5}/yolov8.h (100%) diff --git a/tmp/opi_rtsp/aiengine.cpp b/tmp/opi_rtsp/aiengine.cpp index ae4c62a..d71a898 100644 --- a/tmp/opi_rtsp/aiengine.cpp +++ b/tmp/opi_rtsp/aiengine.cpp @@ -2,7 +2,7 @@ #include #include "aiengine.h" #include "aiengineinference.h" -#include "aiengineinferenceonnx.h" +#include "src-onnx/aiengineinferenceonnx.h" AiEngine::AiEngine(QString modelPath, QObject *parent) diff --git a/tmp/opi_rtsp/opi_rtsp.pro b/tmp/opi_rtsp/opi_rtsp.pro index 4bb2a88..072d3fa 100644 --- a/tmp/opi_rtsp/opi_rtsp.pro +++ b/tmp/opi_rtsp/opi_rtsp.pro @@ -2,11 +2,8 @@ QT += core CONFIG += c++11 link_pkgconfig concurrent PKGCONFIG += opencv4 -SOURCES += main.cpp \ - aiengine.cpp \ - aiengineinference.cpp \ - aiengineinferenceonnx.cpp \ - aienginertsplistener.cpp +SOURCES += *.cpp +HEADERS += *.h opi5 { message("OPI5 build") @@ -15,27 +12,17 @@ opi5 { QMAKE_CXXFLAGS += -DOPI5_BUILD LIBS += /usr/local/lib/librknnrt.so OBJECTS_DIR = objs-opi5 - SOURCES += \ - ./opi5/image_drawing.c \ - ./opi5/file_utils.c \ - ./opi5/postprocess.cc \ - ./opi5/image_utils.c \ - ./opi5/yolov8.cc + SOURCES += src-opi5/*.c src-opi5/*.cc + HEADERS += src-opi5/*.h } else { - message("PC build") + message("ONNX build") message("You must use YOLOv10 ONNX files") - SOURCES += pc/inference.cpp - QMAKE_CXXFLAGS += -DPC_BUILD + QMAKE_CXXFLAGS += -DONNX_BUILD INCLUDEPATH += /opt/onnxruntime-linux-x64-1.18.0/include LIBS += /opt/onnxruntime-linux-x64-1.18.0/lib/libonnxruntime.so.1.18.0 - OBJECTS_DIR = objs-pc QMAKE_LFLAGS += -Wl,-rpath,/opt/onnxruntime-linux-x64-1.18.0/lib + OBJECTS_DIR = objs-onnx + SOURCES += src-onnx/*.cpp + HEADERS += src-onnx/*.h } - -HEADERS += \ - aiengine.h \ - aiengineinference.h \ - aiengineinferenceonnx.h \ - aienginertsplistener.h \ - config.h diff --git a/tmp/opi_rtsp/aiengineinferenceonnx.cpp b/tmp/opi_rtsp/src-onnx/aiengineinferenceonnx.cpp similarity index 100% rename from tmp/opi_rtsp/aiengineinferenceonnx.cpp rename to tmp/opi_rtsp/src-onnx/aiengineinferenceonnx.cpp diff --git a/tmp/opi_rtsp/aiengineinferenceonnx.h b/tmp/opi_rtsp/src-onnx/aiengineinferenceonnx.h similarity index 91% rename from tmp/opi_rtsp/aiengineinferenceonnx.h rename to tmp/opi_rtsp/src-onnx/aiengineinferenceonnx.h index c591979..85e537d 100644 --- a/tmp/opi_rtsp/aiengineinferenceonnx.h +++ b/tmp/opi_rtsp/src-onnx/aiengineinferenceonnx.h @@ -2,7 +2,7 @@ #include #include "aiengineinference.h" -#include "pc/inference.h" +#include "src-onnx/inference.h" class AiEngineInferenceOnnx : public AiEngineInference { diff --git a/tmp/opi_rtsp/pc/inference.cpp b/tmp/opi_rtsp/src-onnx/inference.cpp similarity index 100% rename from tmp/opi_rtsp/pc/inference.cpp rename to tmp/opi_rtsp/src-onnx/inference.cpp diff --git a/tmp/opi_rtsp/pc/inference.h b/tmp/opi_rtsp/src-onnx/inference.h similarity index 100% rename from tmp/opi_rtsp/pc/inference.h rename to tmp/opi_rtsp/src-onnx/inference.h diff --git a/tmp/opi_rtsp/opi5/bus.png b/tmp/opi_rtsp/src-opi5/bus.png similarity index 100% rename from tmp/opi_rtsp/opi5/bus.png rename to tmp/opi_rtsp/src-opi5/bus.png diff --git a/tmp/opi_rtsp/opi5/common.h b/tmp/opi_rtsp/src-opi5/common.h similarity index 100% rename from tmp/opi_rtsp/opi5/common.h rename to tmp/opi_rtsp/src-opi5/common.h diff --git a/tmp/opi_rtsp/opi5/file_utils.c b/tmp/opi_rtsp/src-opi5/file_utils.c similarity index 100% rename from tmp/opi_rtsp/opi5/file_utils.c rename to tmp/opi_rtsp/src-opi5/file_utils.c diff --git a/tmp/opi_rtsp/opi5/file_utils.h b/tmp/opi_rtsp/src-opi5/file_utils.h similarity index 100% rename from tmp/opi_rtsp/opi5/file_utils.h rename to tmp/opi_rtsp/src-opi5/file_utils.h diff --git a/tmp/opi_rtsp/opi5/font.h b/tmp/opi_rtsp/src-opi5/font.h similarity index 100% rename from tmp/opi_rtsp/opi5/font.h rename to tmp/opi_rtsp/src-opi5/font.h diff --git a/tmp/opi_rtsp/opi5/image_drawing.c b/tmp/opi_rtsp/src-opi5/image_drawing.c similarity index 100% rename from tmp/opi_rtsp/opi5/image_drawing.c rename to tmp/opi_rtsp/src-opi5/image_drawing.c diff --git a/tmp/opi_rtsp/opi5/image_drawing.h b/tmp/opi_rtsp/src-opi5/image_drawing.h similarity index 100% rename from tmp/opi_rtsp/opi5/image_drawing.h rename to tmp/opi_rtsp/src-opi5/image_drawing.h diff --git a/tmp/opi_rtsp/opi5/image_utils.c b/tmp/opi_rtsp/src-opi5/image_utils.c similarity index 100% rename from tmp/opi_rtsp/opi5/image_utils.c rename to tmp/opi_rtsp/src-opi5/image_utils.c diff --git a/tmp/opi_rtsp/opi5/image_utils.h b/tmp/opi_rtsp/src-opi5/image_utils.h similarity index 100% rename from tmp/opi_rtsp/opi5/image_utils.h rename to tmp/opi_rtsp/src-opi5/image_utils.h diff --git a/tmp/opi_rtsp/opi5/postprocess.cc b/tmp/opi_rtsp/src-opi5/postprocess.cc similarity index 100% rename from tmp/opi_rtsp/opi5/postprocess.cc rename to tmp/opi_rtsp/src-opi5/postprocess.cc diff --git a/tmp/opi_rtsp/opi5/postprocess.h b/tmp/opi_rtsp/src-opi5/postprocess.h similarity index 100% rename from tmp/opi_rtsp/opi5/postprocess.h rename to tmp/opi_rtsp/src-opi5/postprocess.h diff --git a/tmp/opi_rtsp/opi5/yolov8.cc b/tmp/opi_rtsp/src-opi5/yolov8.cc similarity index 100% rename from tmp/opi_rtsp/opi5/yolov8.cc rename to tmp/opi_rtsp/src-opi5/yolov8.cc diff --git a/tmp/opi_rtsp/opi5/yolov8.h b/tmp/opi_rtsp/src-opi5/yolov8.h similarity index 100% rename from tmp/opi_rtsp/opi5/yolov8.h rename to tmp/opi_rtsp/src-opi5/yolov8.h