[DLStreamer] Remove deprecated VPUX (#1528)

Author: yunowo

libraries/dl-streamer/CMakeLists.txt

@@ -104,7 +104,6 @@ cmake_dependent_option(ENABLE_TESTS "Parameter to enable tests building" ON "UNI
 cmake_dependent_option(ENABLE_FUZZING "Parameter to enable fuzzy tests building" OFF "UNIX" OFF)
 cmake_dependent_option(ENABLE_RDKAFKA_INSTALLATION "Enables rdkafka installation" OFF "UNIX" OFF)
 option(ENABLE_AUDIO_INFERENCE_ELEMENTS "Enables audio inference elements" ON)
-option(ENABLE_VPUX "Enables VPUX specific features" OFF)
 option(ENABLE_REALSENSE "Parameter to enable RelaseSense plugin compilation" OFF)
 option(ENABLE_GENAI "Enables GenAI elements" OFF)
 # Enable GenAI by default on Windows.

libraries/dl-streamer/cmake/config.h.in

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  ******************************************************************************/
@@ -8,7 +8,6 @@
 #define CONFIG_H
 
 #cmakedefine ENABLE_VAAPI
-#cmakedefine ENABLE_VPUX
 #cmakedefine ENABLE_ITT
 
 #endif

libraries/dl-streamer/include/dlstreamer/gst/mappers/gst_to_cpu.h

@@ -112,16 +112,6 @@ class MemoryMapperGSTToCPU : public BaseMemoryMapper {
             tensors[i] = std::make_shared<CPUTensor>(info.tensors[i], data);
         }
         auto dst = new BaseFrame(info.media_type, info.format, tensors);
-
-#ifdef ENABLE_VPUX // also get DMA FD
-        GstMemory *mem = gst_buffer_peek_memory(src->gst_buffer(), 0);
-        if (!mem)
-            throw std::runtime_error("Failed to get GstBuffer memory");
-        if (gst_is_dmabuf_memory(mem)) {
-            int dma_fd = gst_dmabuf_memory_get_fd(mem.get());
-            set_handle("dma_fd", dma_fd);
-        }
-#endif
         auto deleter = [frame_ptr](BaseFrame *dst) {
             gst_video_frame_unmap(frame_ptr.get());
             delete dst;

libraries/dl-streamer/src/monolithic/gst/audio_inference_elements/base/gva_audio_base_inference.c

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  ******************************************************************************/
@@ -13,7 +13,6 @@
 #define DEFAULT_SLIDING_WINDOW 1
 #define DEFAULT_THRESHOLD 0.5
 #define DEFAULT_DEVICE "CPU"
-#define DEFAULT_DMA_FD 0
 
 enum { PROP_0, PROP_MODEL, PROP_MODEL_PROC, PROP_SLIDING_WINDOW, PROP_THRESHOLD, PROP_DEVICE };
 
@@ -41,7 +40,6 @@ static void gva_audio_base_inference_init(GvaAudioBaseInference *audio_base_infe
     audio_base_inference->threshold = DEFAULT_THRESHOLD;
     audio_base_inference->device = g_strdup(DEFAULT_DEVICE);
     audio_base_inference->values_checked = FALSE;
-    audio_base_inference->dma_fd = DEFAULT_DMA_FD;
 }
 
 static void gva_audio_base_inference_class_init(GvaAudioBaseInferenceClass *klass) {

libraries/dl-streamer/src/monolithic/gst/audio_inference_elements/base/gva_audio_base_inference.h

@@ -29,7 +29,6 @@ typedef struct _GvaAudioBaseInference {
     gchar *device;
 
     // other fields
-    int dma_fd; // used if VPUX remote blob enabled
     gboolean values_checked;
     guint sample_length;
     // smart pointers cannot be used because of mixed c and c++ code

libraries/dl-streamer/src/monolithic/gst/audio_inference_elements/base/processor.cpp

@@ -132,17 +132,6 @@ GstFlowReturn infer_audio(GvaAudioBaseInference *audio_base_inference, GstBuffer
             throw std::runtime_error("Invalid Audio buffer");
         auto map_context = std::unique_ptr<GstMapInfo, std::function<void(GstMapInfo *)>>(
             &map, [buf](GstMapInfo *map) { gst_buffer_unmap(buf, map); });
-#ifdef ENABLE_VPUX
-        auto mem = GstMemoryUniquePtr(gst_buffer_get_memory(buf, 0), gst_memory_unref);
-        if (not mem.get())
-            throw std::runtime_error("Failed to get GstBuffer memory");
-        if (gst_is_dmabuf_memory(mem.get())) {
-            int fd = gst_dmabuf_memory_get_fd(mem);
-            if (fd <= 0)
-                throw std::runtime_error("Failed to get file desc associated with GstBuffer memory");
-            audio_base_inference->dma_fd = fd;
-        }
-#endif
         auto samples = reinterpret_cast<int16_t *>(map.data);
         uint32_t num_samples = map.size / sizeof(int16_t);
         check_and_adjust_properties(num_samples, audio_base_inference);
@@ -155,9 +144,9 @@ GstFlowReturn infer_audio(GvaAudioBaseInference *audio_base_inference, GstBuffer
             std::vector<float> normalized_samples = audio_base_inference->pre_proc(&frame);
             auto normalized_samples_u8 = inf_handle->convertFloatToU8(normalized_samples);
             if (normalized_samples_u8.empty())
-                inf_handle->setInputBlob(normalized_samples.data(), audio_base_inference->dma_fd);
+                inf_handle->setInputBlob(normalized_samples.data());
             else
-                inf_handle->setInputBlob(normalized_samples_u8.data(), audio_base_inference->dma_fd);
+                inf_handle->setInputBlob(normalized_samples_u8.data());
             inf_handle->infer();
             audio_base_inference->post_proc(&frame, inf_handle->getInferenceOutput());
         }

libraries/dl-streamer/src/monolithic/gst/common/gva_caps.h

@@ -25,9 +25,7 @@
 #define VASURFACE_CAPS
 #endif
 
-#ifdef ENABLE_VPUX
-#define DMA_BUFFER_CAPS GST_VIDEO_CAPS_MAKE_WITH_FEATURES(DMABUF_FEATURE_STR, "{ DMA_DRM }") "; "
-#elif defined ENABLE_VAAPI
+#ifdef ENABLE_VAAPI
 #define DMA_BUFFER_CAPS GST_VIDEO_CAPS_MAKE_WITH_FEATURES(DMABUF_FEATURE_STR, "{ DMA_DRM }") "; "
 #else
 #define DMA_BUFFER_CAPS

libraries/dl-streamer/src/monolithic/gst/inference_elements/base/inference_impl.cpp

@@ -326,11 +326,7 @@ GetPreferredImagePreproc(CapsFeature caps, const std::vector<ModelInputProcessor
         }
         break;
     case DMA_BUF_CAPS_FEATURE:
-#ifdef ENABLE_VPUX
-        result = ImagePreprocessorType::IE;
-#else
         result = ImagePreprocessorType::VAAPI_SYSTEM;
-#endif
         break;
     case D3D11_MEMORY_CAPS_FEATURE:
         result = ImagePreprocessorType::D3D11;
@@ -556,11 +552,7 @@ MemoryType GetMemoryType(CapsFeature caps_feature) {
     case CapsFeature::SYSTEM_MEMORY_CAPS_FEATURE:
         return MemoryType::SYSTEM;
     case CapsFeature::DMA_BUF_CAPS_FEATURE:
-#ifdef ENABLE_VPUX
-        return MemoryType::SYSTEM;
-#else
         return MemoryType::DMA_BUFFER;
-#endif
     case CapsFeature::VA_SURFACE_CAPS_FEATURE:
     case CapsFeature::VA_MEMORY_CAPS_FEATURE:
         return MemoryType::VAAPI;

libraries/dl-streamer/src/monolithic/inference_backend/image_inference/openvino/openvino_image_inference.cpp

@@ -1522,103 +1522,6 @@ void OpenVINOImageInference::FreeRequest(std::shared_ptr<BatchRequest> request)
     request_processed_.notify_all();
 }
 
-#if 0
-InferenceEngine::RemoteContext::Ptr
-OpenVINOImageInference::CreateRemoteContext(const InferenceBackend::InferenceConfig &config) {
-    InferenceEngine::RemoteContext::Ptr remote_context;
-    const std::string &device = config.at(KEY_BASE).at(KEY_DEVICE);
-
-#ifdef ENABLE_VPUX
-    std::string vpu_device_name;
-    bool has_vpu_device_id = false;
-    std::tie(has_vpu_device_id, vpu_device_name) = Utils::parseDeviceName(device);
-    if (!vpu_device_name.empty()) {
-        const std::string msg = "VPUX device defined as " + vpu_device_name;
-        GVA_INFO(msg.c_str());
-
-        const std::string base_device = "VPUX";
-        std::string device = vpu_device_name;
-        if (!has_vpu_device_id) {
-            // Retrieve ID of the first available device
-            std::vector<std::string> device_list =
-                IeCoreSingleton::Instance().GetMetric(base_device, METRIC_KEY(AVAILABLE_DEVICES));
-            if (!device_list.empty())
-                device = device_list.at(0);
-            // else device is already set to VPU-0
-        }
-        const InferenceEngine::ParamMap params = {{InferenceEngine::KMB_PARAM_KEY(DEVICE_ID), device}};
-        remote_context = IeCoreSingleton::Instance().CreateContext(base_device, params);
-    }
-#endif
-
-#ifdef ENABLE_VAAPI
-    const bool is_gpu_device = device.rfind("GPU", 0) == 0;
-    // There are 3 possible scenarios:
-    // 1. memory_type == VAAPI: we are going to use the surface sharing mode and we have to provide
-    // VADisplay to GPU plugin so it can work with VaSurfaces that we are going to submit via BLOBs.
-    // 2.1. memory_type == SYSTEM and display is available: VAAPI serves only as pre-processing and
-    // we don't have to provide VADisplay to the plugin in such case. However, by providing VADisplay,
-    // we can make sure that the plugin will choose the same GPU for inference as for decoding by
-    // vaapi elements.
-    // 2.2. memory_type == SYSTEM and display is not available: user chose to perform decode on CPU
-    // and inference on GPU. IE pre-processing is used in this case.
-    // In cases 1 and 2.1 we don't need to specify GPU number (GPU.0, GPU.1) to achieve device affinity.
-    // In case 2.2 user may choose desired GPU for inference. Currently matching GPU ID to actual
-    // hardware is not possible due to OpenVINO™ API lacking.
-    if (is_gpu_device && (memory_type == MemoryType::VAAPI || memory_type == MemoryType::SYSTEM)) {
-        if (context_) {
-            using namespace InferenceEngine;
-
-            // TODO: Bug in OpenVINO™ 2021.4.X. Caused by using GPU_THROUGHPUT_STREAMS=GPU_THROUGHPUT_AUTO.
-            // During CreateContext() call, IE creates queues for each of GPU_THROUGHPUT_STREAMS. By
-            // default GPU_THROUGHPUT_STREAMS is set to 1, so IE creates only 1 queue. Then, during
-            // LoadNetwork() call we pass GPU_THROUGHPUT_STREAMS=GPU_THROUGHPUT_AUTO and GPU plugin may
-            // set number of streams to more than 1 (for example, 2). Then for each of the streams (2)
-            // GPU plugin tries to get IE queue, but fails because number of streams is greater than
-            // number of created queues.
-            // Because of that user may get an error:
-            //     Unable to create network with stream_id=1
-            // Workaround for this is to set GPU_THROUGHPUT_STREAMS to IE prior to CreateContext() call.
-            auto &ie_config = config.at(KEY_INFERENCE);
-            auto it = ie_config.find(KEY_GPU_THROUGHPUT_STREAMS);
-            if (it != ie_config.end())
-                IeCoreSingleton::Instance().SetConfig({*it}, "GPU");
-
-            auto va_display = context_->handle(dlstreamer::VAAPIContext::key::va_display);
-            if (!va_display)
-                throw std::runtime_error("Error getting va_display from context");
-
-            InferenceEngine::ParamMap contextParams = {
-                {GPU_PARAM_KEY(CONTEXT_TYPE), GPU_PARAM_VALUE(VA_SHARED)},
-                {GPU_PARAM_KEY(VA_DEVICE), static_cast<InferenceEngine::gpu_handle_param>(va_display)}};
-
-            // GPU tile affinity
-            if (device == "GPU.x") {
-#ifdef ENABLE_GPU_TILE_AFFINITY
-                VaDpyWrapper dpyWrapper(va_display);
-                int tile_id = dpyWrapper.currentSubDevice();
-                // If tile_id is -1 (single-tile GPU is used or the driver doesn't support this feature)
-                // then GPU plugin will choose the device and tile on its own and there will be no affinity
-                contextParams.insert({GPU_PARAM_KEY(TILE_ID), tile_id});
-#else
-                GVA_WARNING("Current version of OpenVINO™ toolkit doesn't support tile affinity, version 2022.1 or "
-                            "higher is required");
-#endif
-            }
-
-            remote_context = IeCoreSingleton::Instance().CreateContext("GPU", contextParams);
-        } else if (memory_type == MemoryType::VAAPI) {
-            throw std::runtime_error("Display must be provided for GPU device with vaapi-surface-sharing backend");
-        }
-    }
-#else
-    UNUSED(device);
-#endif
-
-    return remote_context;
-}
-#endif
-
 bool OpenVINOImageInference::IsQueueFull() {
     return freeRequests.empty();
 }

libraries/dl-streamer/src/monolithic/inference_backend/include/inference_backend/image.h

@@ -73,7 +73,7 @@ struct Image {
             void *d3d11_device;
         };
     };
-    int dma_fd = -1; // if type==DMA_BUFFER or VPUX device is used
+    int dma_fd = -1; // if type==DMA_BUFFER
 
     int format = 0; // FourCC
     uint64_t drm_format_modifier = 0;