From 468b8e026aebd7cfeda65956fa4b48e124a85a8d Mon Sep 17 00:00:00 2001
From: Ilya Lavrenov <ilya.lavrenov@intel.com>
Date: Thu, 14 Nov 2024 13:56:48 +0400
Subject: [PATCH] Build GenAI via OpenVINO wheel (#958)

---
 .github/workflows/windows.yml | 4 ++--
 CMakeLists.txt                | 8 ++++++++
 pyproject.toml                | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 33096d6d7b..70bac20af0 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -243,7 +243,7 @@ jobs:
       - name: Test bindings (wheel)
         run: |
           . "${{ env.OV_INSTALL_DIR }}/setupvars.ps1"
-          python -m pip install . --verbose
+          python -m pip install . --verbose --find-links ${env:OV_INSTALL_DIR}/wheels
           python -m pytest -v ./tests/python_tests/ --ignore ./tests/python_tests/test_whisper_generate_api.py --ignore ./tests/python_tests/test_vlm_api.py -k "not test_set_chat_template"
 
   genai_python_lib_whisper:
@@ -307,7 +307,7 @@ jobs:
       - name: Test bindings (wheel)
         run: |
           . "${{ env.OV_INSTALL_DIR }}/setupvars.ps1"
-          python -m pip install . --verbose
+          python -m pip install . --verbose --find-links ${env:OV_INSTALL_DIR}/wheels
           python -m pytest -v ./tests/python_tests/test_whisper_generate_api.py -k "not test_smoke"
 
   genai_python_lib_vlm:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac70b8fd62..c79ea6d2a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,10 +35,13 @@ project(OpenVINOGenAI
         HOMEPAGE_URL "https://github.com/openvinotoolkit/openvino.genai"
         LANGUAGES CXX C)
 
+<<<<<<< HEAD
 if(NOT DEFINED Python3_FIND_VIRTUALENV)
     set(Python3_FIND_VIRTUALENV FIRST)
 endif()
 
+=======
+>>>>>>> 96bcffeb (Build GenAI via OpenVINO wheel (#958))
 # Looking for OpenVINO in the python distribution. It doesn't work for cross-compiling build
 if(NOT CMAKE_CROSSCOMPILING)
     find_package(Python3 REQUIRED)
@@ -55,7 +58,12 @@ find_package(OpenVINODeveloperPackage ${OpenVINOGenAI_VERSION} QUIET
              PATHS "${OpenVINO_DIR}")
 if(NOT OpenVINODeveloperPackage_FOUND)
     find_package(OpenVINO ${OpenVINOGenAI_VERSION} REQUIRED
+<<<<<<< HEAD
                  COMPONENTS Runtime Threading)
+=======
+                 COMPONENTS Runtime
+                 PATHS "${OpenVINO_DIR_PY}")
+>>>>>>> 96bcffeb (Build GenAI via OpenVINO wheel (#958))
 endif()
 
 include(cmake/features.cmake)
diff --git a/pyproject.toml b/pyproject.toml
index cc6f8ad8e1..3e3ec90beb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -51,9 +51,9 @@ options = {"BUILD_TOKENIZERS" = "OFF"}
 
 [build-system]
 requires = [
-    "py-build-cmake==0.3.0",
-    "openvino~=2025.0.0.0.dev",
+    "py-build-cmake==0.3.1",
     "pybind11-stubgen==2.5.1",
+    "openvino~=2024.5.0.0.dev",
     "cmake~=3.23.0"
 ]
 build-backend = "py_build_cmake.build"