openvino.genai-

Author: Wovchena

.github/workflows/genai_lib.yml

@@ -16,9 +16,9 @@ jobs:
       - run: source ./ov/setupvars.sh && cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build/
       - run: source ./ov/setupvars.sh && cmake --build ./build/ --config Release -j
       - run: python -m pip install openvino  # Can't load CenOS libraries from the archive
-      - run: PYTHONPATH=./src/python/ python -c "from openvino.genai.py_generate_pipeline import LLMPipeline"
+      - run: PYTHONPATH=./src/python/ python -c "from openvino_genai.py_generate_pipeline import LLMPipeline"
       - run: source ./ov/setupvars.sh && python -m pip install --pre --upgrade . --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
-      - run: python -c "from openvino.genai.py_generate_pipeline import LLMPipeline"
+      - run: python -c "from openvino_genai.py_generate_pipeline import LLMPipeline"
 
   genai_lib_windows:
     runs-on: windows-latest
@@ -37,6 +37,6 @@ jobs:
       - run: call w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64\setupvars.bat && cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build/
       - run: call w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64\setupvars.bat && cmake --build ./build/ --config Release -j
       - run: python -m pip install "numpy<1.27"
-      - run: set "PYTHONPATH=./src/python;" && call w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64\setupvars.bat && python -c "from openvino.genai.py_generate_pipeline import LLMPipeline"  # cmd evaluates variables in a different way. Setting PYTHONPATH before setupvars.bat instead of doing that after solves that.
+      - run: set "PYTHONPATH=./src/python;" && call w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64\setupvars.bat && python -c "from openvino_genai.py_generate_pipeline import LLMPipeline"  # cmd evaluates variables in a different way. Setting PYTHONPATH before setupvars.bat instead of doing that after solves that.
       - run: call w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64\setupvars.bat && python -m pip install .
-      - run: python -c "from openvino.genai.py_generate_pipeline import LLMPipeline"
+      - run: python -c "from openvino_genai.py_generate_pipeline import LLMPipeline"

pyproject.toml

@@ -25,13 +25,13 @@ cmake.build-type = "Release"
 cmake.targets = ["py_generate_pipeline", "generate_pipeline_lib"]
 install.components = ["genai", "genai_python"]
 sdist.cmake = true
-wheel.packages = ["src/python/openvino"]
-wheel.install-dir = "openvino/genai"
+wheel.packages = ["src/python/openvino_genai"]
+wheel.install-dir = "openvino_genai"
 wheel.build-tag = "000"
 wheel.license-files = ["LICENSE", "SECURITY.md", "third-party-programs.txt"]
 
 [[tool.scikit-build.generate]]
-path = "openvino/genai/__version__.py"
+path = "openvino_genai/__version__.py"
 template = '''
 __version__ = "${version}"
 '''

src/cpp/CMakeLists.txt

@@ -64,5 +64,5 @@ install(TARGETS ${TARGET_NAME} LIBRARY DESTINATION . COMPONENT genai RUNTIME DES
 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")
+        "${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

@@ -29,7 +29,7 @@ elseif(APPLE)
     set(rpaths "@loader_path")
     if(DEFINED SKBUILD)
         # in case we build pip package, we need to refer to libopenvino.dylib from 'openvino' package
-        list(APPEND rpaths "@loader_path/../../openvino/libs")
+        list(APPEND rpaths "@loader_path/../openvino/libs")
     endif()
 endif()
 
@@ -41,5 +41,5 @@ endif()
 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")
+        "${CMAKE_CURRENT_SOURCE_DIR}/openvino_genai/$<TARGET_FILE_NAME:py_generate_pipeline>"
+    COMMENT "Copy py_generate_pipeline to src/python/openvino_genai/")