276 Remove any calls to CustomVCL class

IntelLabs · Nov 21, 2024 · b2b01c6 · b2b01c6
1 parent dee7103
commit b2b01c6
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 180 deletions.
diff --git a/include/vcl/CustomVCL.h b/include/vcl/CustomVCL.h
diff --git a/include/vcl/utils.h b/include/vcl/utils.h
@@ -5,7 +5,7 @@
  *
  * The MIT License
  *
- * @copyright Copyright (c) 2017 Intel Corporation
+ * @copyright Copyright (c) 2024 Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,9 +29,10 @@
 
 #pragma once
 
-#include <string>
 #include <time.h>
 #include <vector>
+#include <cstdint>
+#include <string>
 
 namespace VCL {
 

diff --git a/src/BlobCommand.h b/src/BlobCommand.h
@@ -5,7 +5,7 @@
  *
  * The MIT License
  *
- * @copyright Copyright (c) 2017 Intel Corporation
+ * @copyright Copyright (c) 2024 Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"),
@@ -30,7 +30,6 @@
  */
 
 #pragma once
-#include "vcl/CustomVCL.h"
 #include "vcl/Image.h"
 #include <mutex>
 #include <string>

diff --git a/src/ImageCommand.cc b/src/ImageCommand.cc
@@ -79,22 +79,6 @@ int ImageCommand::enqueue_operations(VCL::Image &img, const Json::Value &ops,
       }
     } else if (type == "userOp") {
       img.userOperation(get_value<Json::Value>(op, "options"));
-    } else if (type == "custom") {
-      VCL::Image *tmp_image = new VCL::Image(img, true);
-      try {
-        if (custom_vcl_function(img, op) != 0) {
-          img.deep_copy_cv(tmp_image->get_cvmat(
-              true)); // function completed but error detected
-          delete tmp_image;
-          return -1;
-        }
-      } catch (...) {
-        img.deep_copy_cv(
-            tmp_image->get_cvmat(true)); // function threw exception
-        delete tmp_image;
-        return -1;
-      }
-      delete tmp_image;
     } else {
       throw ExceptionCommand(ImageError, "Operation not defined");
       return -1;

diff --git a/src/ImageCommand.h b/src/ImageCommand.h
@@ -30,7 +30,6 @@
  */
 
 #pragma once
-#include "vcl/CustomVCL.h"
 #include "vcl/Image.h"
 #include <mutex>
 #include <string>

diff --git a/src/vcl/CMakeLists.txt b/src/vcl/CMakeLists.txt
@@ -23,9 +23,8 @@ add_library(vcl SHARED
     TDBSparseDescriptorSet.cc
     utils.cc
     Video.cc
-    CustomVCL.cc
     RemoteConnection.cc
-        ../../utils/src/timers/TimerMap.cc
+    ../../utils/src/timers/TimerMap.cc
 )
 link_directories( /usr/local/lib )
 target_link_libraries(vcl lapack faiss tiledb flinng avformat avcodec swscale ${OpenCV_LIBS})

diff --git a/src/vcl/CustomVCL.cc b/src/vcl/CustomVCL.cc
diff --git a/src/vcl/Image.cc b/src/vcl/Image.cc
@@ -538,10 +538,6 @@ void Image::UserOperation::operator()(Image *img) {
         zmq::context_t context(1);
         zmq::socket_t socket(context, zmq::socket_type::req);
 
-        // This is setting a timeout for avoiding infinite loops
-        socket.setsockopt(ZMQ_SNDTIMEO, 10000); // milliseconds
-        socket.setsockopt(ZMQ_RCVTIMEO, 30000);
-
         std::string port = _options["port"].asString();
         std::string address = "tcp://127.0.0.1:" + port;
 
@@ -601,7 +597,7 @@ void Image::UserOperation::operator()(Image *img) {
         } else {
           if (response == "") {
             std::string errorMessage =
-                "UserOperation error: Timeout, no response from the server";
+                "UserOperation error: empty response from the server";
             std::cout << errorMessage << std::endl;
             throw VCLException(SystemNotFound, errorMessage);
           }

diff --git a/src/vcl/Video.cc b/src/vcl/Video.cc
@@ -1252,9 +1252,6 @@ void Video::UserOperation::operator()(Video *video, cv::Mat &frame,
 
       zmq::context_t context(1);
       zmq::socket_t socket(context, zmq::socket_type::req);
-      // This is setting a timeout for avoiding infinite loops
-      socket.setsockopt(ZMQ_SNDTIMEO, 10000); // milliseconds
-      socket.setsockopt(ZMQ_RCVTIMEO, 30000);
 
       std::string port = _options["port"].asString();
       std::string address = "tcp://127.0.0.1:" + port;
@@ -1296,7 +1293,7 @@ void Video::UserOperation::operator()(Video *video, cv::Mat &frame,
       } else {
         if (response == "") {
           std::string errorMessage =
-              "UserOperation error: Timeout, no response from the server";
+              "UserOperation error: empty response from the server";
           std::cout << errorMessage << std::endl;
           throw VCLException(SystemNotFound, errorMessage);
         }