Reverted not needed changes.

Author: popovaan

.github/workflows/causal_lm_cpp.yml

@@ -15,6 +15,7 @@ concurrency:
 env:
   l_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2024.5.0-16570-19eb02fe60b/l_openvino_toolkit_ubuntu20_2024.5.0.dev20240830_x86_64.tgz
   l_u22_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2024.5.0-16570-19eb02fe60b/l_openvino_toolkit_ubuntu22_2024.5.0.dev20240830_x86_64.tgz
+  l_u24_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2024.5.0-16570-19eb02fe60b/l_openvino_toolkit_ubuntu24_2024.5.0.dev20240830_x86_64.tgz
   m_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2024.5.0-16570-19eb02fe60b/m_openvino_toolkit_macos_12_6_2024.5.0.dev20240830_x86_64.tgz
   w_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2024.5.0-16570-19eb02fe60b/w_openvino_toolkit_windows_2024.5.0.dev20240830_x86_64.zip
 jobs:
@@ -631,7 +632,7 @@ jobs:
       - name: Install OpenVINO
         run: |
           mkdir ./ov/
-          curl ${{ env.l_ov_link }} | tar --directory ./ov/ --strip-components 1 -xz
+          curl ${{ env.l_u24_ov_link }} | tar --directory ./ov/ --strip-components 1 -xz
           sudo ./ov/install_dependencies/install_openvino_dependencies.sh
       - name: Build app
         run: |
@@ -717,7 +718,7 @@ jobs:
           source ./ov/setupvars.sh
           export PYTHONPATH=./build/:$PYTHONPATH
           printf 'What is on the image?\n' > ./input.txt
-          timeout 600s python ./samples/python/vlm_chat_sample/vlm_chat_sample.py ./miniCPM-V-2_6/ d5fbbd1a-d484-415c-88cb-9986625b7b11 < input.txt > ./pred.txt
+          timeout 300s --preserve-status 0 python ./samples/python/vlm_chat_sample/vlm_chat_sample.py ./miniCPM-V-2_6/ d5fbbd1a-d484-415c-88cb-9986625b7b11 < input.txt > ./pred.txt
 
   cpp-continuous-batching-ubuntu:
     runs-on: ubuntu-20.04-8-cores

samples/python/vlm_chat_sample/vlm_chat_sample.py

@@ -59,7 +59,7 @@ def main():
             prompt = input('question:\n')
         except EOFError:
             break
-        pipe(prompt, [image], config, streamer)
+        pipe(prompt, image=image, generation_config=config, streamer=streamer)
         print('\n----------')
     pipe.finish_chat()
 

src/python/py_vlm_pipeline.cpp

@@ -104,40 +104,46 @@ void init_vlm_pipeline(py::module_& m) {
         .def(py::init([](
             const std::string& model_path, 
             const std::string& device,
-            const std::map<std::string, py::object>& config
+            const std::map<std::string, py::object>& config,
+            const ov::Core& core
         ) {
             ScopedVar env_manager(utils::ov_tokenizers_module_path());
-            return std::make_unique<ov::genai::VLMPipeline>(model_path, device, utils::properties_to_any_map(config));
+            return std::make_unique<ov::genai::VLMPipeline>(model_path, device, utils::properties_to_any_map(config), core);
         }),
         py::arg("model_path"), "folder with openvino_model.xml and openvino_tokenizer[detokenizer].xml files", 
         py::arg("device") = "CPU", "device on which inference will be done",
-        py::arg("config") = ov::AnyMap({}), "openvino.properties map"
+        py::arg("config") = ov::AnyMap({}), "openvino.properties map",
+        py::arg("core") = ov::Core(), "openvino.Core object",
         R"(
             VLMPipeline class constructor.
             model_path (str): Path to the model file.
             device (str): Device to run the model on (e.g., CPU, GPU). Default is 'CPU'.
             Add {"scheduler_config": ov_genai.SchedulerConfig} to config properties to create continuous batching pipeline.
+            core (openvino.Core): openvino.Core instance.
         )")
 
         .def(py::init([](
             const std::string& model_path,
             const ov::genai::Tokenizer& tokenizer,
             const std::string& device,
-            const std::map<std::string, py::object>& config
+            const std::map<std::string, py::object>& config,
+            const ov::Core& core
         ) {
             ScopedVar env_manager(utils::ov_tokenizers_module_path());
-            return std::make_unique<ov::genai::VLMPipeline>(model_path, tokenizer, device, utils::properties_to_any_map(config));
+            return std::make_unique<ov::genai::VLMPipeline>(model_path, tokenizer, device, utils::properties_to_any_map(config), core);
         }),
         py::arg("model_path"),
         py::arg("tokenizer"),
         py::arg("device") = "CPU",
-        py::arg("config") = ov::AnyMap({}), "openvino.properties map"
+        py::arg("config") = ov::AnyMap({}), "openvino.properties map",
+        py::arg("core") = ov::Core(), "openvino.Core object",
         R"(
             VLMPipeline class constructor for manualy created openvino_genai.Tokenizer.
             model_path (str): Path to the model file.
             tokenizer (openvino_genai.Tokenizer): tokenizer object.
             device (str): Device to run the model on (e.g., CPU, GPU). Default is 'CPU'.
             Add {"scheduler_config": ov_genai.SchedulerConfig} to config properties to create continuous batching pipeline.
+            core (openvino.Core): openvino.Core instance.
         )")
         .def("start_chat", &ov::genai::VLMPipeline::start_chat)
         .def("finish_chat", &ov::genai::VLMPipeline::finish_chat)