fix link error.

Signed-off-by: xipingya <xiping.yan@intel.com>

Author: xipingyan

src/cpp/CMakeLists.txt

@@ -88,8 +88,6 @@ endif()
 # yaml-cpp dependency (use centralized cmake module)
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/yaml-cpp.cmake)
 
-find_package(TBB REQUIRED)
-
 if(NOT TARGET minja)
     FetchContent_Declare(
         minja
@@ -225,7 +223,7 @@ endif()
 
 target_include_directories(${TARGET_NAME_OBJ} SYSTEM PRIVATE "${safetensors.h_SOURCE_DIR}")
 
-target_link_libraries(${TARGET_NAME_OBJ} PRIVATE openvino::runtime openvino::threading nlohmann_json::nlohmann_json minja ${YAML_CPP_TARGET} PRIVATE TBB::tbb)
+target_link_libraries(${TARGET_NAME_OBJ} PRIVATE openvino::runtime openvino::threading nlohmann_json::nlohmann_json minja ${YAML_CPP_TARGET})
 
 # modeling/ sources use internal OpenVINO dev-api headers (e.g. openvino/op/linear_attn.hpp)
 # openvino::core::dev exposes src/core/dev_api which contains these headers.

src/python/py_utils.cpp

@@ -455,23 +455,13 @@ ov::genai::StreamerVariant pystreamer_to_streamer(const PyBindStreamerVariant& p
                 [](std::function<std::optional<uint16_t>(py::str)>* f) {
                     if (Py_IsInitialized()) {
                         py::gil_scoped_acquire acquire;
+                        delete f;
+                    } else {
+                        delete f;
+                    }
                 }
             );
 
-                py::gil_scoped_acquire acquire;
-                PyObject* py_str = PyUnicode_DecodeUTF8(subword.data(), subword.length(), "replace");
-                if (!py_str) {
-                    PyErr_Clear();
-                    return StreamingStatus::RUNNING;
-                }
-                std::optional<uint16_t> callback_output = (*shared_callback)(py::reinterpret_steal<py::str>(py_str));
-                if (callback_output.has_value()) {
-                    if (*callback_output == (uint16_t)StreamingStatus::RUNNING)
-                        return StreamingStatus::RUNNING;
-                    else if (*callback_output == (uint16_t)StreamingStatus::CANCEL)
-                        return StreamingStatus::CANCEL;
-                    return StreamingStatus::STOP;
-                } else {
             auto callback_wrapped = [shared_callback = std::move(shared_callback)](std::string subword) -> ov::genai::StreamingStatus {
                 py::gil_scoped_acquire acquire;
                 PyObject* py_str = PyUnicode_DecodeUTF8(subword.data(), subword.length(), "replace");

src/python/py_vlm_pipeline.cpp

@@ -284,6 +284,26 @@ void init_vlm_pipeline(py::module_& m) {
             py::arg("streamer") = std::monostate(), "streamer",
             (vlm_generate_prompt_docstring + std::string(" \n ")).c_str()
         )
+        .def(
+            "generate",
+            [](ov::genai::VLMPipeline& pipe,
+                const std::string& prompt,
+                const ov::Tensor& image,
+                const ov::genai::GenerationConfig& generation_config,
+                const pyutils::PyBindStreamerVariant& streamer,
+                const py::kwargs& kwargs
+            ) -> py::typing::Union<ov::genai::VLMDecodedResults> {
+                return call_vlm_generate(pipe, prompt, {image}, {}, generation_config, streamer, kwargs);
+            },
+            py::arg("prompt"), "Input string",
+            py::arg("image"), "Input image",
+            py::arg("generation_config"), "generation_config",
+            py::arg("streamer") = std::monostate(), "streamer",
+            (vlm_generate_prompt_docstring + std::string(" \n ")).c_str()
+        )
+        .def(
+            "generate",
+            [](ov::genai::VLMPipeline& pipe,
                const std::string& prompt,
                const py::kwargs& kwargs
             )  -> py::typing::Union<ov::genai::VLMDecodedResults> {

tests/module_genai/cpp/CMakeLists.txt

@@ -39,14 +39,19 @@ set(TEST_TARGET_NAME "genai_modules_test")
 add_executable(${TEST_TARGET_NAME} ${src_modules} ${src_pipelines} ${src_utils} $<TARGET_OBJECTS:openvino_genai_obj>)
 
 get_target_property(genai_link_libraries openvino::genai LINK_LIBRARIES)
-if(genai_link_libraries)
-  set(filtered_genai_link_libraries ${genai_link_libraries})
-  if(NOT TARGET OpenCL::OpenCL)
-    list(REMOVE_ITEM filtered_genai_link_libraries OpenCL::OpenCL)
-  endif()
-endif()
+set(filtered_genai_link_libraries ${genai_link_libraries})
+list(REMOVE_ITEM filtered_genai_link_libraries OpenCL::OpenCL)
 
 target_link_libraries(${TEST_TARGET_NAME} PRIVATE ${filtered_genai_link_libraries} gtest_main gmock_main ${OpenCV_LIBS})
+
+if(ENABLE_SYSTEM_OPENCL)
+  find_library(SYSTEM_OPENCL_LIBRARY NAMES OpenCL)
+  if(SYSTEM_OPENCL_LIBRARY)
+    target_link_libraries(${TEST_TARGET_NAME} PRIVATE ${SYSTEM_OPENCL_LIBRARY})
+  else()
+    message(WARNING "OpenCL library was not found; module tests that require OpenCL may fail to link")
+    endif()
+endif()
 target_include_directories(${TEST_TARGET_NAME} PRIVATE "${OpenVINOGenAI_SOURCE_DIR}/src/cpp/src"
                                                        "${CMAKE_CURRENT_SOURCE_DIR}"
                                                        $<TARGET_PROPERTY:openvino::genai,INTERFACE_INCLUDE_DIRECTORIES>