Populate python with the libraries to allow skipping wheel installation

Author: Wovchena

.github/workflows/genai_lib.yml

@@ -13,11 +13,17 @@ jobs:
       - run: mkdir ./ov/
       - run: curl https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2024.1.0-14758-22bd6ff0494/l_openvino_toolkit_centos7_2024.1.0.dev20240315_x86_64.tgz | tar --directory ./ov/ --strip-components 1 -xz  # Install CentOS7 instead of Ubuntu to match PyPI distribution ABI
       - run: sudo ./ov/install_dependencies/install_openvino_dependencies.sh
+      - run: source ./ov/setupvars.sh && cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build/
+      - run: cmake --build ./build/ -j
+      - run: source ./ov/setupvars.sh && PYTHONPATH=./src/python:$PYTHONPATH python -c "from openvino.genai.py_generate_pipeline import LLMPipeline"
       - run: source ./ov/setupvars.sh && python -m pip install --pre . --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
       - run: python -c "from openvino.genai.py_generate_pipeline import LLMPipeline"
 
   genai_lib_windows:
     runs-on: windows-latest
+    defaults:
+      run:
+        shell: cmd
     steps:
       - uses: actions/checkout@v4
         with:
@@ -27,6 +33,8 @@ jobs:
           python-version: 3.8
       - run: curl --output ov.zip https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2024.1.0-14645-e6dc0865128/w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64.zip
       - run: unzip ov.zip
+      - run: call w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64\setupvars.bat && cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build/
+      - run: cmake --build ./build/ -j
+      - run: call w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64\setupvars.bat && set PYTHONPATH=./src/python:$PYTHONPATH && python -c "from openvino.genai.py_generate_pipeline import LLMPipeline"
       - run: call w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64\setupvars.bat && python -m pip install .
-        shell: cmd
       - run: python -c "from openvino.genai.py_generate_pipeline import LLMPipeline"

src/cpp/CMakeLists.txt

@@ -31,10 +31,10 @@ function(ov_genai_build_jinja2cpp)
 
         add_subdirectory("${jinja2cpp_SOURCE_DIR}" "${jinja2cpp_BINARY_DIR}" EXCLUDE_FROM_ALL)
         # openvino::runtime exports _GLIBCXX_USE_CXX11_ABI=0 on CenOS7.
-        # It needs to be propagated to every lib GenAI links with. It's
-        # enough to propagate it to fmt, because fmt propagates to
+        # It needs to be propagated to every library GenAI links with.
+        # It's enough to propagate to fmt, because fmt propagates to
         # jinja2cpp.
-        target_link_libraries(fmt PUBLIC openvino::runtime)
+        target_compile_definitions(fmt PUBLIC $<TARGET_PROPERTY:openvino::runtime,INTERFACE_COMPILE_DEFINITIONS>)
     endif()
 endfunction()
 
@@ -57,4 +57,12 @@ target_link_libraries(${TARGET_NAME} PUBLIC openvino::runtime PRIVATE nlohmann_j
 target_compile_definitions(${TARGET_NAME} PRIVATE OPENVINO_TOKENIZERS_PATH=\"$<TARGET_FILE:openvino_tokenizers>\")
 
 target_compile_features(${TARGET_NAME} PUBLIC cxx_std_17)
+
 install(TARGETS ${TARGET_NAME} LIBRARY DESTINATION . COMPONENT genai RUNTIME DESTINATION . COMPONENT genai)
+
+# Populate python with the libraries to allow skipping wheel installation
+add_custom_command(TARGET generate_pipeline_lib POST_BUILD
+    COMMAND "${CMAKE_COMMAND}" -E copy
+        "$<TARGET_FILE:generate_pipeline_lib>"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../python/openvino/genai/$<TARGET_FILE_NAME:generate_pipeline_lib>"
+    COMMENT "Copy generate_pipeline_lib to src/python/openvino/genai")

src/python/CMakeLists.txt

@@ -17,16 +17,13 @@ endif()
 
 pybind11_add_module(py_generate_pipeline py_generate_pipeline.cpp)
 target_link_libraries(py_generate_pipeline PRIVATE generate_pipeline_lib)
+
 install(TARGETS py_generate_pipeline LIBRARY DESTINATION . COMPONENT genai_python)
 
 # setting RPATH / LC_RPATH depending on platform
 if(LINUX)
     # to find libgenerate_pipeline_lib.so in the same folder
     set(rpaths "$ORIGIN")
-    if(DEFINED SKBUILD)
-        # in case we build pip package, we need to refer to libopenvino.so from 'openvino' package
-        list(APPEND rpaths "@ORIGIN/../../openvino/libs")
-    endif()
 elseif(APPLE)
     # to find libgenerate_pipeline_lib.dylib in the same folder
     set(rpaths "@loader_path")
@@ -39,3 +36,10 @@ endif()
 if(rpaths)
     set_target_properties(py_generate_pipeline PROPERTIES INSTALL_RPATH "${rpaths}")
 endif()
+
+# Populate python with the libraries to allow skipping wheel installation
+add_custom_command(TARGET py_generate_pipeline POST_BUILD
+    COMMAND "${CMAKE_COMMAND}" -E copy
+        "$<TARGET_FILE:py_generate_pipeline>"
+        "${CMAKE_CURRENT_SOURCE_DIR}/openvino/genai/$<TARGET_FILE_NAME:py_generate_pipeline>"
+    COMMENT "Copy py_generate_pipeline to src/python/openvino/genai")