Added tokenizer path to text2image (openvinotoolkit#1057)

apaniukov · Oct 24, 2024 · 275729c · 275729c
1 parent 5e37c60
commit 275729c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/python/py_text2image_models.cpp b/src/python/py_text2image_models.cpp
@@ -11,6 +11,7 @@
 
 #include "openvino/genai/text2image/pipeline.hpp"
 
+#include "tokenizers_path.hpp"
 #include "py_utils.hpp"
 
 namespace py = pybind11;
@@ -21,6 +22,7 @@ void init_clip_text_model(py::module_& m) {
         .def(py::init([](
             const std::filesystem::path& root_dir
         ) {
+            ScopedVar env_manager(pyutils::ov_tokenizers_module_path());
             return std::make_unique<ov::genai::CLIPTextModel>(root_dir);
         }),
         py::arg("root_dir"), "Model root directory", 
@@ -33,6 +35,7 @@ void init_clip_text_model(py::module_& m) {
             const std::string& device,
             const py::kwargs& kwargs
         ) {
+            ScopedVar env_manager(pyutils::ov_tokenizers_module_path());
             return std::make_unique<ov::genai::CLIPTextModel>(root_dir, device, pyutils::kwargs_to_any_map(kwargs));
         }),
         py::arg("root_dir"), "Model root directory", 
@@ -229,6 +232,7 @@ void init_clip_text_model_with_projection(py::module_& m) {
         .def(py::init([](
             const std::filesystem::path& root_dir
         ) {
+            ScopedVar env_manager(pyutils::ov_tokenizers_module_path());
             return std::make_unique<ov::genai::CLIPTextModelWithProjection>(root_dir);
         }),
         py::arg("root_dir"), "Model root directory", 
@@ -241,6 +245,7 @@ void init_clip_text_model_with_projection(py::module_& m) {
             const std::string& device,
             const py::kwargs& kwargs
         ) {
+            ScopedVar env_manager(pyutils::ov_tokenizers_module_path());
             return std::make_unique<ov::genai::CLIPTextModelWithProjection>(root_dir, device,  pyutils::kwargs_to_any_map(kwargs));
         }),
         py::arg("root_dir"), "Model root directory", 

diff --git a/src/python/py_text2image_pipeline.cpp b/src/python/py_text2image_pipeline.cpp
@@ -10,6 +10,8 @@
 #include <pybind11/functional.h>
 
 #include "openvino/genai/text2image/pipeline.hpp"
+
+#include "tokenizers_path.hpp"
 #include "py_utils.hpp"
 
 namespace py = pybind11;
@@ -183,6 +185,7 @@ void init_text2image_pipeline(py::module_& m) {
         .def(py::init([](
             const std::filesystem::path& models_path
         ) {
+            ScopedVar env_manager(pyutils::ov_tokenizers_module_path());
             return std::make_unique<ov::genai::Text2ImagePipeline>(models_path);
         }),
         py::arg("models_path"), "folder with exported model files.", 
@@ -196,6 +199,7 @@ void init_text2image_pipeline(py::module_& m) {
             const std::string& device,
             const py::kwargs& kwargs
         ) {
+            ScopedVar env_manager(pyutils::ov_tokenizers_module_path());
             return std::make_unique<ov::genai::Text2ImagePipeline>(models_path, device, text2image_kwargs_to_any_map(kwargs, true));
         }),
         py::arg("models_path"), "folder with exported model files.",