From 6b789d1523dc82c90e8ee68a6ebc42b3bb8c860d Mon Sep 17 00:00:00 2001 From: Wovchena Date: Wed, 31 Jul 2024 18:39:15 +0400 Subject: [PATCH 1/3] Produce a single archive It turns out cpack ignores cache vars. --- CMakeLists.txt | 3 ++- src/docs/BUILD.md | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7059324d84..6d753073f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,7 @@ project(OpenVINOGenAI HOMEPAGE_URL "https://github.com/openvinotoolkit/openvino.genai" LANGUAGES CXX) +option(GENAI_CPACK_ARCHIVE_COMPONENT_INSTALL "If enabled (ON) multiple packages are generated." ON) option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" OFF) option(RAPIDJSON_BUILD_DOC "Build rapidjson documentation." OFF) @@ -64,7 +65,7 @@ add_subdirectory(tests/cpp) install(FILES LICENSE DESTINATION docs/licensing COMPONENT licensing_genai RENAME LICENSE-GENAI) install(FILES third-party-programs.txt DESTINATION docs/licensing COMPONENT licensing_genai RENAME third-party-programs-genai.txt) -set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) +set(CPACK_ARCHIVE_COMPONENT_INSTALL ${GENAI_CPACK_ARCHIVE_COMPONENT_INSTALL}) set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF) # Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/2614 set(CPACK_COMPONENTS_ALL core_genai core_genai_dev cpp_samples_genai licensing_genai openvino_tokenizers openvino_tokenizers_docs) diff --git a/src/docs/BUILD.md b/src/docs/BUILD.md index 81cff10b48..fc904ae80e 100644 --- a/src/docs/BUILD.md +++ b/src/docs/BUILD.md @@ -99,7 +99,7 @@ The path to the OpenVINO install directory is referred as `` throug 4. Build the project: ```sh - cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build/ + cmake -DCMAKE_BUILD_TYPE=Release -DGENAI_CPACK_ARCHIVE_COMPONENT_INSTALL=OFF -S ./ -B ./build/ cmake --build ./build/ --config Release -j ``` @@ -113,7 +113,15 @@ The path to the OpenVINO install directory is referred as `` throug cmake --install ./build/ --config Release --prefix ``` - #### Option 2 - setting paths to built OpenVINO GenAI artifacts manually: + #### Option 2 - generate an archive + + The following command will generate an archive containing OpenVINO Tokenizers and OpenVINO GenAI. The archive won't include OpenVINO itself, run the command for OpenVINO to generate an OpenVINO only archive. Generation of an archive containig all the components isn't implemented. + + ```sh + cmake --build build --config Debug --target package + ``` + + #### Option 3 - setting paths to built OpenVINO GenAI artifacts manually: The path to the OpenVINO GenAI root directory is referred as `` throughout the document. From 96bd9923be91b0b8edae00cb7576dcd6ac688e2a Mon Sep 17 00:00:00 2001 From: Wovchena Date: Wed, 31 Jul 2024 18:39:15 +0400 Subject: [PATCH 2/3] Produce a single archive It turns out cpack ignores cache vars. --- src/docs/BUILD.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docs/BUILD.md b/src/docs/BUILD.md index fc904ae80e..f3b2939dcc 100644 --- a/src/docs/BUILD.md +++ b/src/docs/BUILD.md @@ -118,7 +118,7 @@ The path to the OpenVINO install directory is referred as `` throug The following command will generate an archive containing OpenVINO Tokenizers and OpenVINO GenAI. The archive won't include OpenVINO itself, run the command for OpenVINO to generate an OpenVINO only archive. Generation of an archive containig all the components isn't implemented. ```sh - cmake --build build --config Debug --target package + cmake --install ./build/ --config Release --target package ``` #### Option 3 - setting paths to built OpenVINO GenAI artifacts manually: From cb3f4e8f55856c1f29b470af2d22e4e5f731446b Mon Sep 17 00:00:00 2001 From: Wovchena Date: Wed, 31 Jul 2024 18:39:15 +0400 Subject: [PATCH 3/3] Produce a single archive It turns out cpack ignores cache vars. --- src/docs/BUILD.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docs/BUILD.md b/src/docs/BUILD.md index f3b2939dcc..88976c9903 100644 --- a/src/docs/BUILD.md +++ b/src/docs/BUILD.md @@ -118,7 +118,7 @@ The path to the OpenVINO install directory is referred as `` throug The following command will generate an archive containing OpenVINO Tokenizers and OpenVINO GenAI. The archive won't include OpenVINO itself, run the command for OpenVINO to generate an OpenVINO only archive. Generation of an archive containig all the components isn't implemented. ```sh - cmake --install ./build/ --config Release --target package + cmake --build ./build/ --config Release --target package ``` #### Option 3 - setting paths to built OpenVINO GenAI artifacts manually: