Move cpp text generation samples to one folder

openvinotoolkit · Dec 18, 2024 · 92c3d94 · 92c3d94
1 parent 9bcadf7
commit 92c3d94
Show file tree

Hide file tree

Showing 15 changed files with 99 additions and 153 deletions.
diff --git a/.github/workflows/causal_lm_cpp.yml b/.github/workflows/causal_lm_cpp.yml
@@ -53,7 +53,7 @@ jobs:
           wget https://huggingface.co/smangrul/tinyllama_lora_sql/resolve/main/adapter_model.safetensors?download=true -O adapter_model.safetensors
       - run: >
           . ./ov/setupvars.sh
-          && timeout 25s ./build/samples/cpp/multinomial_causal_lm/multinomial_causal_lm ./open_llama_3b_v2/ a
+          && timeout 25s ./build/samples/cpp/text_generation/multinomial_causal_lm ./open_llama_3b_v2/ a
         env:
           PYTHONPATH: "./build"
       - run: >
@@ -78,7 +78,7 @@ jobs:
       matrix:
         executable:
           [
-            ./build/samples/cpp/beam_search_causal_lm/beam_search_causal_lm,
+            ./build/samples/cpp/text_generation/beam_search_causal_lm,
             python ./samples/python/beam_search_causal_lm/beam_search_causal_lm.py,
           ]
     runs-on: ubuntu-20.04
@@ -338,7 +338,7 @@ jobs:
           optimum-cli export openvino --trust-remote-code --weight-format fp16 --model Qwen/Qwen1.5-7B-Chat Qwen1.5-7B-Chat
       - run: >
           . ./ov/setupvars.sh
-          && timeout 50s ./build/samples/cpp/beam_search_causal_lm/beam_search_causal_lm ./Qwen1.5-7B-Chat/ "你好！"
+          && timeout 50s ./build/samples/cpp/text_generation/beam_search_causal_lm ./Qwen1.5-7B-Chat/ "你好！"
           | diff <(timeout 50s ./samples/python/beam_search_causal_lm/beam_search_causal_lm.py ./Qwen1.5-7B-Chat/ "你好！") -
         env:
           PYTHONPATH: "./build"
@@ -373,7 +373,7 @@ jobs:
           optimum-cli export openvino --trust-remote-code --weight-format fp16 --model microsoft/phi-2 phi-2
       - run: >
           . ./ov/setupvars.sh
-          && timeout 50s ./build/samples/cpp/beam_search_causal_lm/beam_search_causal_lm ./phi-2/ 69
+          && timeout 50s ./build/samples/cpp/text_generation/beam_search_causal_lm ./phi-2/ 69
           | diff <(timeout 50s ./samples/python/beam_search_causal_lm/beam_search_causal_lm.py ./phi-2/ 69) -
         env:
           PYTHONPATH: "./build"
@@ -408,7 +408,7 @@ jobs:
           optimum-cli export openvino --trust-remote-code --weight-format fp16 --model argilla/notus-7b-v1 notus-7b-v1
       - run: >
           . ./ov/setupvars.sh
-          && timeout 50s ./build/samples/cpp/beam_search_causal_lm/beam_search_causal_lm ./notus-7b-v1/ 69
+          && timeout 50s ./build/samples/cpp/text_generation/beam_search_causal_lm ./notus-7b-v1/ 69
           | diff <(timeout 50s ./samples/python/beam_search_causal_lm/beam_search_causal_lm.py ./notus-7b-v1/ 69) -
         env:
           PYTHONPATH: "./build"
@@ -445,7 +445,7 @@ jobs:
       - name: run and compare
         run: |
           source ./ov/setupvars.sh
-          ./build/samples/cpp/speculative_decoding_lm/speculative_decoding_lm ./dolly-v2-7b/ ./dolly-v2-3b/ "Alan Turing was a" > predictions_speculative.txt
+          ./build/samples/cpp/text_generation/speculative_decoding_lm ./dolly-v2-7b/ ./dolly-v2-3b/ "Alan Turing was a" > predictions_speculative.txt
           ./build/samples/cpp/text_generation/greedy_causal_lm ./dolly-v2-7b/ "Alan Turing was a" > predictions_greedy.txt
           python ./samples/python/speculative_decoding_lm/speculative_decoding_lm.py ./dolly-v2-7b/ ./dolly-v2-3b/ "Alan Turing was a" > predictions_py.txt
           python -c "
@@ -502,7 +502,7 @@ jobs:
           Question: Can you please add 2 and 3
           A:' > ./prompt.txt
 
-          ./build/samples/cpp/prompt_lookup_decoding_lm/prompt_lookup_decoding_lm ./TinyLlama-1.1B-Chat-v1.0/ "$(<prompt.txt)" > predictions_prompt_lookup.txt
+          ./build/samples/cpp/text_generation/prompt_lookup_decoding_lm ./TinyLlama-1.1B-Chat-v1.0/ "$(<prompt.txt)" > predictions_prompt_lookup.txt
           ./build/samples/cpp/text_generation/greedy_causal_lm ./TinyLlama-1.1B-Chat-v1.0/ "$(<prompt.txt)" > predictions_greedy.txt
           python ./samples/python/prompt_lookup_decoding_lm/prompt_lookup_decoding_lm.py ./TinyLlama-1.1B-Chat-v1.0/ "$(<prompt.txt)" > predictions_py.txt
           python -c "
@@ -664,7 +664,7 @@ jobs:
         run: |
           source ./ov/setupvars.sh
           printf 'What is 2 + 2?\nWhat is the previous answer?\nAdd 1 to it.\nSubtract 5 from it.\nWhy is the sun yellow?\nWhat was my first question?\n' > ./input.txt
-          timeout 30s ./build/samples/cpp/chat_sample/chat_sample ./TinyLlama-1.1B-Chat-v1.0/ < input.txt > ./pred.txt
+          timeout 30s ./build/samples/cpp/text_generation/chat_sample ./TinyLlama-1.1B-Chat-v1.0/ < input.txt > ./pred.txt
           python -c "
           from transformers import AutoTokenizer, AutoModelForCausalLM
           model_id = 'TinyLlama/TinyLlama-1.1B-Chat-v1.0'

diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
@@ -2,14 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_subdirectory(cpp/beam_search_causal_lm)
 add_subdirectory(cpp/benchmark_genai)
-add_subdirectory(cpp/chat_sample)
 add_subdirectory(cpp/text_generation)
-add_subdirectory(cpp/lora_greedy_causal_lm)
-add_subdirectory(cpp/multinomial_causal_lm)
-add_subdirectory(cpp/prompt_lookup_decoding_lm)
-add_subdirectory(cpp/speculative_decoding_lm)
 add_subdirectory(cpp/image_generation)
 add_subdirectory(cpp/visual_language_chat)
 add_subdirectory(cpp/whisper_speech_recognition)
@@ -22,15 +16,9 @@ install(FILES
     COMPONENT cpp_samples_genai)
 
 install(DIRECTORY
-            cpp/beam_search_causal_lm
             cpp/benchmark_genai
-            cpp/chat_sample
             cpp/text_generation
             cpp/image_generation
-            cpp/lora_greedy_causal_lm
-            cpp/multinomial_causal_lm
-            # Don't install prompt_lookup_decoding_lm because it doesn't use openvino_genai library and is not verified yet.
-            cpp/speculative_decoding_lm
             cpp/visual_language_chat
             cpp/whisper_speech_recognition
         DESTINATION samples/cpp COMPONENT cpp_samples_genai)

diff --git a/samples/cpp/beam_search_causal_lm/CMakeLists.txt b/samples/cpp/beam_search_causal_lm/CMakeLists.txt
diff --git a/samples/cpp/chat_sample/CMakeLists.txt b/samples/cpp/chat_sample/CMakeLists.txt
diff --git a/samples/cpp/lora_greedy_causal_lm/CMakeLists.txt b/samples/cpp/lora_greedy_causal_lm/CMakeLists.txt
diff --git a/samples/cpp/multinomial_causal_lm/CMakeLists.txt b/samples/cpp/multinomial_causal_lm/CMakeLists.txt
diff --git a/samples/cpp/prompt_lookup_decoding_lm/CMakeLists.txt b/samples/cpp/prompt_lookup_decoding_lm/CMakeLists.txt
diff --git a/samples/cpp/speculative_decoding_lm/CMakeLists.txt b/samples/cpp/speculative_decoding_lm/CMakeLists.txt
diff --git a/samples/cpp/text_generation/CMakeLists.txt b/samples/cpp/text_generation/CMakeLists.txt
@@ -8,28 +8,117 @@ find_package(OpenVINOGenAI REQUIRED
     NO_CMAKE_FIND_ROOT_PATH
 )
 
+
+# greedy_causal_lm
 add_executable(greedy_causal_lm greedy_causal_lm.cpp)
 target_link_libraries(greedy_causal_lm PRIVATE openvino::genai)
 set_target_properties(greedy_causal_lm PROPERTIES
     COMPILE_PDB_NAME greedy_causal_lm
     # Ensure out of box LC_RPATH on macOS with SIP
     INSTALL_RPATH_USE_LINK_PATH ON)
 target_compile_features(greedy_causal_lm PRIVATE cxx_std_11)
-
 install(TARGETS greedy_causal_lm
         RUNTIME DESTINATION samples_bin/
         COMPONENT samples_bin
         EXCLUDE_FROM_ALL)
 
+
+# encrypted_model_causal_lm
 add_executable(encrypted_model_causal_lm encrypted_model_causal_lm.cpp)
 target_link_libraries(encrypted_model_causal_lm PRIVATE openvino::genai)
 set_target_properties(encrypted_model_causal_lm PROPERTIES
     COMPILE_PDB_NAME encrypted_model_causal_lm
     # Ensure out of box LC_RPATH on macOS with SIP
     INSTALL_RPATH_USE_LINK_PATH ON)
 target_compile_features(encrypted_model_causal_lm PRIVATE cxx_std_11)
-
 install(TARGETS encrypted_model_causal_lm
         RUNTIME DESTINATION samples_bin/
         COMPONENT samples_bin
         EXCLUDE_FROM_ALL)
+
+
+# beam_search_causal_lm
+add_executable(beam_search_causal_lm beam_search_causal_lm.cpp)
+target_link_libraries(beam_search_causal_lm PRIVATE openvino::genai)
+set_target_properties(beam_search_causal_lm PROPERTIES
+    COMPILE_PDB_NAME beam_search_causal_lm
+    # Ensure out of box LC_RPATH on macOS with SIP
+    INSTALL_RPATH_USE_LINK_PATH ON)
+target_compile_features(beam_search_causal_lm PRIVATE cxx_std_11)
+install(TARGETS beam_search_causal_lm
+        RUNTIME DESTINATION samples_bin/
+        COMPONENT samples_bin
+        EXCLUDE_FROM_ALL)
+
+
+# chat_sample
+add_executable(chat_sample chat_sample.cpp)
+target_link_libraries(chat_sample PRIVATE openvino::genai)
+set_target_properties(chat_sample PROPERTIES
+    COMPILE_PDB_NAME chat_sample
+    # Ensure out of box LC_RPATH on macOS with SIP
+    INSTALL_RPATH_USE_LINK_PATH ON)
+target_compile_features(chat_sample PRIVATE cxx_std_11)
+install(TARGETS chat_sample
+        RUNTIME DESTINATION samples_bin/
+        COMPONENT samples_bin
+        EXCLUDE_FROM_ALL)
+
+
+# lora_greedy_causal_lm
+add_executable(lora_greedy_causal_lm lora_greedy_causal_lm.cpp)
+target_link_libraries(lora_greedy_causal_lm PRIVATE openvino::genai)
+set_target_properties(lora_greedy_causal_lm PROPERTIES
+    COMPILE_PDB_NAME lora_greedy_causal_lm
+    # Ensure out of box LC_RPATH on macOS with SIP
+    INSTALL_RPATH_USE_LINK_PATH ON)
+target_compile_features(lora_greedy_causal_lm PRIVATE cxx_std_11)
+install(TARGETS lora_greedy_causal_lm
+    RUNTIME DESTINATION samples_bin/
+    COMPONENT samples_bin
+    EXCLUDE_FROM_ALL)
+
+
+# multinomial_causal_lm
+add_executable(multinomial_causal_lm multinomial_causal_lm.cpp)
+target_link_libraries(multinomial_causal_lm PRIVATE openvino::genai)
+set_target_properties(multinomial_causal_lm PROPERTIES
+    COMPILE_PDB_NAME multinomial_causal_lm
+    # Ensure out of box LC_RPATH on macOS with SIP
+    INSTALL_RPATH_USE_LINK_PATH ON)
+target_compile_features(multinomial_causal_lm PRIVATE cxx_std_11)
+
+install(TARGETS multinomial_causal_lm
+        RUNTIME DESTINATION samples_bin/
+        COMPONENT samples_bin
+        EXCLUDE_FROM_ALL)
+
+
+# prompt_lookup_decoding_lm
+add_executable(prompt_lookup_decoding_lm prompt_lookup_decoding_lm.cpp)
+target_link_libraries(prompt_lookup_decoding_lm PRIVATE openvino::genai)
+
+set_target_properties(prompt_lookup_decoding_lm PROPERTIES
+    COMPILE_PDB_NAME prompt_lookup_decoding_lm
+    # Ensure out of box LC_RPATH on macOS with SIP
+    INSTALL_RPATH_USE_LINK_PATH ON)
+# Don't install prompt_lookup_decoding_lm because it doesn't use openvino_genai library and is not verified yet.
+# install(TARGETS prompt_lookup_decoding_lm
+#         RUNTIME DESTINATION samples_bin/
+#         COMPONENT samples_bin
+#         EXCLUDE_FROM_ALL)
+
+
+# speculative_decoding_lm
+add_executable(speculative_decoding_lm speculative_decoding_lm.cpp)
+target_link_libraries(speculative_decoding_lm PRIVATE openvino::genai)
+
+set_target_properties(speculative_decoding_lm PROPERTIES
+    COMPILE_PDB_NAME speculative_decoding_lm
+    # Ensure out of box LC_RPATH on macOS with SIP
+    INSTALL_RPATH_USE_LINK_PATH ON)
+
+install(TARGETS speculative_decoding_lm
+        RUNTIME DESTINATION samples_bin/
+        COMPONENT samples_bin
+        EXCLUDE_FROM_ALL)
diff --git a/...earch_causal_lm/beam_search_causal_lm.cpp → ...text_generation/beam_search_causal_lm.cpp b/...earch_causal_lm/beam_search_causal_lm.cpp → ...text_generation/beam_search_causal_lm.cpp
diff --git a/samples/cpp/chat_sample/chat_sample.cpp → samples/cpp/text_generation/chat_sample.cpp b/samples/cpp/chat_sample/chat_sample.cpp → samples/cpp/text_generation/chat_sample.cpp
diff --git a/...reedy_causal_lm/lora_greedy_causal_lm.cpp → ...text_generation/lora_greedy_causal_lm.cpp b/...reedy_causal_lm/lora_greedy_causal_lm.cpp → ...text_generation/lora_greedy_causal_lm.cpp
diff --git a/...omial_causal_lm/multinomial_causal_lm.cpp → ...text_generation/multinomial_causal_lm.cpp b/...omial_causal_lm/multinomial_causal_lm.cpp → ...text_generation/multinomial_causal_lm.cpp
diff --git a/...decoding_lm/prompt_lookup_decoding_lm.cpp → ..._generation/prompt_lookup_decoding_lm.cpp b/...decoding_lm/prompt_lookup_decoding_lm.cpp → ..._generation/prompt_lookup_decoding_lm.cpp
diff --git a/...e_decoding_lm/speculative_decoding_lm.cpp → ...xt_generation/speculative_decoding_lm.cpp b/...e_decoding_lm/speculative_decoding_lm.cpp → ...xt_generation/speculative_decoding_lm.cpp