Rough in memx support

Author: connortechnology

CMakeLists.txt

@@ -32,12 +32,12 @@ endif()
 #set(CMAKE_INSTALL_ALWAYS ON)
 
 # Default CLFAGS and CXXFLAGS:
-set(CMAKE_C_FLAGS_RELEASE "-O2")
-set(CMAKE_CXX_FLAGS_RELEASE "-O2")
-set(CMAKE_C_FLAGS_DEBUG "-g")
-set(CMAKE_CXX_FLAGS_DEBUG "-g")
-set(CMAKE_C_FLAGS_OPTIMISED "-O3")
-set(CMAKE_CXX_FLAGS_OPTIMISED "-O3")
+set(CMAKE_C_FLAGS_RELEASE "-O2 -fopenmp")
+set(CMAKE_CXX_FLAGS_RELEASE "-O2 -fopenmp")
+set(CMAKE_C_FLAGS_DEBUG "-g -fopenmp")
+set(CMAKE_CXX_FLAGS_DEBUG "-g -fopenmp")
+set(CMAKE_C_FLAGS_OPTIMISED "-O3 -fopenmp")
+set(CMAKE_CXX_FLAGS_OPTIMISED "-O3 -fopenmp")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 set(CMAKE_CXX_STANDARD 17)
@@ -357,10 +357,21 @@ endif()
 
 find_file(HAVE_MEMX_H memx.h /usr/include/memx)
 if(HAVE_MEMX_H)
-  find_library(MEMX_LIBRARIES mx_accl)
+  find_library(MEMX_LIBRARIES memx)
   if(MEMX_LIBRARIES)
-    set(optlibsfound "${optlibsfound} mx_accl")
+    set(optlibsfound "${optlibsfound} memx")
     list(APPEND ZM_BIN_LIBS "${MEMX_LIBRARIES}")
+  else()
+    set(optlibsnotfound "${optlibsnotfound} memx")
+  endif()
+endif()
+
+find_file(HAVE_MX_ACCL_H MxAccl.h /usr/include/memx/accl)
+if(HAVE_MX_ACCL_H)
+  find_library(MX_ACCL_LIBRARIES mx_accl)
+  if(MX_ACCL_LIBRARIES)
+    set(optlibsfound "${optlibsfound} mx_accl")
+    list(APPEND ZM_BIN_LIBS "${MX_ACCL_LIBRARIES}")
   else()
     set(optlibsnotfound "${optlibsnotfound} mx_accl")
   endif()

src/CMakeLists.txt

@@ -37,6 +37,9 @@ set(ZM_BIN_SRC_FILES
   zm_libvnc_camera.cpp
   zm_local_camera.cpp
   zm_memx.cpp
+  zm_mx_accl.cpp
+  zm_memx_yolo_core.cpp
+  zm_memx_yolov8.cpp
   zm_monitor.cpp
   zm_monitor_monitorlink.cpp
   zm_monitor_rtsp2web.cpp

src/zm_ai_server.cpp

@@ -87,11 +87,17 @@ void Usage() {
   Quadra quadra;
 #endif
 
+#undef HAVE_MEMX_H
 #if HAVE_MEMX_H
   #include "zm_memx.h"
   MemX *memx;
 #endif
 
+#if HAVE_MX_ACCL_H
+  #include "zm_mx_accl.h"
+  MxAccl *mx_accl;
+#endif
+
 int main(int argc, char *argv[]) {
   self = argv[0];
 
@@ -172,17 +178,30 @@ int main(int argc, char *argv[]) {
     return 0;
   }
 #endif
+
 #if HAVE_MEMX_H
   Debug(1, "Including MemX");
   memx = new MemX();
-  if (!memx->setup("yolov5", "/var/cache/zoneminder/models/YOLO_v5_nano_leaky_416_416_3_tensorflow.dfp")) {
+  if (!memx->setup("yolov8", "/var/cache/zoneminder/models/YOLO_v8_nano_640_640_3_onnx.dfp")) {
+  //if (!memx->setup("yolov5", "/var/cache/zoneminder/models/YOLO_v5_nano_leaky_416_416_3_tensorflow.dfp")) {
     delete memx;
     memx = nullptr;
     return 0;
   }
 #else
   Debug(1, "Not Including MemX");
 #endif
+#if HAVE_MX_ACCL_H
+  Debug(1, "Including MemX_Accl");
+  mx_accl = new MxAccl();
+  if (!mx_accl->setup("yolov8", "/var/cache/zoneminder/models/YOLO_v8_nano_640_640_3_onnx.dfp")) {
+    delete mx_accl;
+    mx_accl = nullptr;
+    return 0;
+  }
+#else
+  Debug(1, "Not Including MXACCL");
+#endif
 
   std::unordered_map<unsigned int, std::shared_ptr<Monitor>> monitors;
   std::unordered_map<unsigned int, AIThread *> threads;
@@ -206,6 +225,9 @@ int main(int argc, char *argv[]) {
 #endif
 #if HAVE_MEMX_H
             , memx
+#endif
+#if HAVE_MX_ACCL_H
+            , mx_accl
 #endif
             );
       }
@@ -278,6 +300,13 @@ void AIThread::Inference() {
     sleep(1);
   }
 #endif
+#ifdef HAVE_MX_ACCL_H
+  Debug(1, "Starting for mx_accl");
+  while (!terminate_ and !( mx_accl_job = mx_accl->get_job() )) {
+    Warning("Waiting for job");
+    sleep(1);
+  }
+#endif
 
 #if HAVE_QUADRA
 #if !SOFT_DRAWBOX
@@ -300,40 +329,35 @@ void AIThread::Inference() {
 
   while (!(terminate_ or zm_terminate)) {
     std::shared_ptr<ZMPacket> packet = nullptr;
-    Debug(1, "Getting lock"); 
+    Debug(4, "Getting shm lock"); 
     // Need to hold the lock because it guards shared_mem as well.
     std::unique_lock<std::mutex> lck(mutex_);
-    Debug(1, "Having lock"); 
+    Debug(4, "Having lock"); 
     while (!(send_queue.size() or terminate_)) {
-      Debug(1, "Waiting");
       condition_.wait(lck);
-      Debug(1, "Send queue size for monitor %d is %zu", monitor_->Id(), send_queue.size());
+      Debug(4, "Send queue size for monitor %d is %zu", monitor_->Id(), send_queue.size());
     }
     if (terminate_) break;
     packet = send_queue.front();
 
     if (packet) {
       Monitor::SharedData *shared_data = monitor_->getSharedData();
       Debug(4, "Sending image %d for monitor %d", packet->image_index, monitor_->Id());
-#ifdef HAVE_UNTETHER_H
-      speedai->send_image(job, packet->image);
 
       Image *ai_image = monitor_->GetAnalysisImage(packet->image_index);
-      nlohmann::json detections = speedai->receive_detections(job, monitor_->ObjectDetection_Object_Threshold());
-      Debug(1, "detections %s", detections.dump().c_str());
 
-      if (detections.size()) {
-        draw_boxes(packet->image, ai_image, detections, monitor_->LabelSize(), monitor_->LabelSize());
-        //draw_boxes(drawbox_filter, drawbox_filter_ctx, packet->image, ai_image, detections, monitor_->LabelSize(), monitor_->LabelSize());
-      } else {
-        ai_image->Assign(*packet->image);
-      }
+#ifdef HAVE_UNTETHER_H
+      speedai->send_image(job, packet->image);
+      nlohmann::json detections = speedai->receive_detections(job, monitor_->ObjectDetection_Object_Threshold());
 #endif
 #ifdef HAVE_MEMX_H
       memx->send_image(memx_job, packet->image);
-
-      Image *ai_image = monitor_->GetAnalysisImage(packet->image_index);
       nlohmann::json detections = memx->receive_detections(memx_job, monitor_->ObjectDetection_Object_Threshold());
+#endif
+#ifdef HAVE_MX_ACCL_H
+      mx_accl->send_image(mx_accl_job, packet->image);
+      nlohmann::json detections = mx_accl->receive_detections(mx_accl_job, monitor_->ObjectDetection_Object_Threshold());
+#endif
       Debug(1, "detections %s", detections.dump().c_str());
 
       if (detections.size()) {
@@ -342,7 +366,6 @@ void AIThread::Inference() {
       } else {
         ai_image->Assign(*packet->image);
       }
-#endif
 
       shared_data->last_analysis_index = packet->image_index;
 
@@ -436,7 +459,7 @@ void AIThread::Run() {
         (send_queue.size() <= static_cast<unsigned int>(image_buffer_count))
         ) {
       image_index = shared_data->last_decoder_index % image_buffer_count;
-      Debug(3, "Doing SpeedAI on monitor %d.  Decoder index is %d=%d Our index is %d=%d, queue %zu",
+      Debug(3, "Doing ai on monitor %d.  Decoder index is %d=%d Our index is %d=%d, queue %zu",
           monitor_->Id(),
           decoder_image_count, shared_data->last_decoder_index,
           analysis_image_count, image_index, send_queue.size());
@@ -469,7 +492,7 @@ void AIThread::Run() {
       }
 
     } else {
-      Debug(4, "Not Doing SpeedAI on monitor %d.  Decoder count is %d index %d Our count is %d, last_index is %d, index %d",
+      Debug(4, "Not Doing ai on monitor %d.  Decoder count is %d index %d Our count is %d, last_index is %d, index %d",
           monitor_->Id(), decoder_image_count, shared_data->last_decoder_index,
           shared_data->analysis_image_count, shared_data->last_analysis_index, image_index);
 
@@ -651,6 +674,9 @@ AIThread::AIThread(const std::shared_ptr<Monitor> monitor
 #endif
 #if HAVE_MEMX_H
     , MemX *p_memx
+#endif
+#if HAVE_MX_ACCL_H
+    , MxAccl *p_mx_accl
 #endif
     ) :
   monitor_(monitor), terminate_(false)
@@ -660,6 +686,9 @@ AIThread::AIThread(const std::shared_ptr<Monitor> monitor
 #if HAVE_MEMX_H
   , memx(p_memx)
 #endif
+#if HAVE_MX_ACCL_H
+  , mx_accl(p_mx_accl)
+#endif
 #if HAVE_QUADRA
   ,drawbox_filter(nullptr)
 #endif

src/zm_ai_server.h

@@ -24,19 +24,23 @@ extern "C" {
 #if HAVE_MEMX_H
   #include "zm_memx.h"
 #endif
+#if HAVE_MX_ACCL_H
+  #include "zm_mx_accl.h"
+#endif
 
 class Monitor;
 
 class AIThread {
  public:
-  explicit AIThread(const std::shared_ptr<Monitor> monitor
 #if HAVE_UNTETHER_H
-      , SpeedAI *speedai
+  explicit AIThread(const std::shared_ptr<Monitor> monitor, SpeedAI *speedai);
 #endif
 #if HAVE_MEMX_H
-      , MemX *memx
+  explicit AIThread(const std::shared_ptr<Monitor> monitor, MemX *memx);
+#endif
+#if HAVE_MX_ACCL_H
+  explicit AIThread(const std::shared_ptr<Monitor> monitor, MxAccl *memx);
 #endif
-      );
   ~AIThread();
   AIThread(AIThread &rhs) = delete;
   AIThread(AIThread &&rhs) = delete;
@@ -62,6 +66,10 @@ class AIThread {
   MemX *memx;
   MemX::Job *memx_job;
 #endif
+#if HAVE_MX_ACCL_H
+  MxAccl *mx_accl;
+  MxAccl::Job *mx_accl_job;
+#endif
 #if HAVE_QUADRA
   Quadra::filter_worker *drawbox_filter;
 #endif