feat(dlib): update dlib backend

A few more tweaks to fix dlib integration regressions

Added additional build option to optionally enable AVX build mode for dlib

Updated dlib and fixed regression with dlib_actions.h

Bugfix for dlib integration regression

CMakeLists.txt

@@ -252,6 +252,9 @@ option(USE_DLIB_CPU_ONLY "use DLIB without CUDA" OFF)
 option(USE_CAFFE2_CPU_ONLY "use CAFFE2 without CUDA" OFF)
 option(USE_FAISS_CPU_ONLY "use FAISS without CUDA" OFF)
 
+# Dlib AVX option
+option(USE_DLIB_AVX "build dlib with AVX enabled" OFF)
+
 # Deprecated flag
 if (USE_XGBOOST_GPU)
   set(USE_XGBOOST_CPU_ONLY OFF)
@@ -379,7 +382,7 @@ if (USE_DLIB)
     # Dlib
 
     # Currently supported release version of dlib
-    set(DLIB_RELEASE_VERSION v19.18)
+    set(DLIB_RELEASE_VERSION v19.24)
     message(STATUS "Using Dlib version ${DLIB_RELEASE_VERSION}")
     add_definitions(-DUSE_DLIB)
     set(DLIB_LIB_DEPS -ldlib -lopenblas)
@@ -389,7 +392,7 @@ if (USE_DLIB)
             dlib
             PREFIX dlib
             URL https://github.com/davisking/dlib/archive/${DLIB_RELEASE_VERSION}.tar.gz
-            CONFIGURE_COMMAND cd dlib && mkdir -p build && cd build && cmake .. -DDLIB_NO_GUI_SUPPORT=ON -DDLIB_USE_CUDA=OFF -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/dlib/build && cmake --build . --config Release --target install
+            CONFIGURE_COMMAND cd dlib && mkdir -p build && cd build && cmake .. -DUSE_AVX_INSTRUCTIONS=${USE_DLIB_AVX} -DDLIB_NO_GUI_SUPPORT=ON -DDLIB_USE_CUDA=OFF -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/dlib/build && cmake --build . --config Release --target install
             BUILD_COMMAND ""
             INSTALL_COMMAND ""
             BUILD_IN_SOURCE 1
@@ -402,7 +405,7 @@ if (USE_DLIB)
           dlib
           PREFIX dlib
           URL https://github.com/davisking/dlib/archive/${DLIB_RELEASE_VERSION}.tar.gz
-          CONFIGURE_COMMAND cd dlib && mkdir -p build && cd build && cmake .. -DDLIB_NO_GUI_SUPPORT=ON -DDLIB_USE_CUDA=ON -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/dlib/build && cmake --build . --config Release --target install
+          CONFIGURE_COMMAND cd dlib && mkdir -p build && cd build && cmake .. -DUSE_AVX_INSTRUCTIONS=${USE_DLIB_AVX} -DDLIB_NO_GUI_SUPPORT=ON -DDLIB_USE_CUDA=ON -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/dlib/build && cmake --build . --config Release --target install
           BUILD_COMMAND ""
           INSTALL_COMMAND ""
           BUILD_IN_SOURCE 1
@@ -1291,6 +1294,7 @@ message(STATUS "USE_HDF5:              ${USE_HDF5}")
 message(STATUS "USE_TENSORRT:          ${USE_TENSORRT}")
 message(STATUS "USE_DLIB:              ${USE_DLIB}")
 message(STATUS "USE_DLIB_CPU_ONLY:     ${USE_DLIB_CPU_ONLY}")
+message(STATUS "USE_DLIB_AVX:          ${USE_DLIB_AVX}")
 message(STATUS "USE_ANNOY:             ${USE_ANNOY}")
 message(STATUS "USE_FAISS:             ${USE_FAISS}")
 message(STATUS "USE_FAISS_CPU_ONLY:    ${USE_FAISS_CPU_ONLY}")

src/backends/dlib/dlib_actions.cpp

@@ -47,8 +47,9 @@ namespace dd
     std::vector<std::string> bbox_ids;
 
     // check for action parameters
-    double bratio
-        = _params->padding_ratio != nullptr ? _params->padding_ratio : 0.25;
+    double bratio = _params->padding_ratio;
+    if (bratio == 0.0)
+      bratio = 0.25; // Default is 0.25 for DlibAlignCropAction
     int chip_size = _params->chip_size;
     std::vector<APIData> cvad;
 

src/backends/dlib/dlib_actions.h

@@ -30,10 +30,8 @@ namespace dd
   {
   public:
     DlibAlignCropAction(oatpp::Object<DTO::ChainCall> call_dto,
-                        const std::string &action_id,
-                        const std::string &action_type,
                         const std::shared_ptr<spdlog::logger> chain_logger)
-        : ChainAction(call_dto, action_id, action_type, chain_logger)
+        : ChainAction(call_dto, chain_logger)
     {
     }
 

src/backends/dlib/dliblib.cc

@@ -22,6 +22,7 @@
 #include <string>
 #include "dliblib.h"
 #include "imginputfileconn.h"
+#include "dlibinputconns.h"
 #include "outputconnectorstrategy.h"
 
 namespace dd
@@ -96,6 +97,9 @@ namespace dd
       }
   }
 
+// XXX Remove that to print the warnings
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
   template <class TInputConnectorStrategy, class TOutputConnectorStrategy,
             class TMLModel>
   void DlibLib<TInputConnectorStrategy, TOutputConnectorStrategy,
@@ -121,6 +125,8 @@ namespace dd
   {
     // NOT IMPLEMENTED
   }
+// XXX Remove that to print the warnings
+#pragma GCC diagnostic pop
 
   template <class TInputConnectorStrategy, class TOutputConnectorStrategy,
             class TMLModel>

src/jsonapi.cc

@@ -841,9 +841,10 @@ namespace dd
                 return dd_service_bad_request_1006();
               }
             if (store_config
-                && JsonAPI::store_json_config_blob(tfmodel._repo, jstr))
+                && JsonAPI::store_json_config_blob(dlibmodel._repo, jstr))
               _logger->error("couldn't write {} file in model repository {}",
-                             JsonAPI::_json_config_blob_fname, tfmodel._repo);
+                             JsonAPI::_json_config_blob_fname,
+                             dlibmodel._repo);
           }
 #endif
 #ifdef USE_XGBOOST