[None] [ci] Reorganize CMake and Python integration test infrastructure for C++ tests (#6754)

Signed-off-by: Robin Kobus <[email protected]>

Author: Funatiq

cpp/tests/CMakeLists.txt

@@ -69,32 +69,6 @@ function(add_gtest test_name test_src)
   add_dependencies(google-tests ${test_name})
 endfunction()
 
-add_subdirectory(unit_tests)
-
-add_gtest(mpiUtilsTest runtime/mpiUtilsTest.cpp)
-
-add_gtest(gptDecoderTest runtime/gptDecoderTest.cpp)
-add_gtest(gptDecoderBatchedTest runtime/gptDecoderBatchedTest.cpp)
-add_gtest(medusaModuleTest runtime/medusaModuleTest.cpp)
-
-add_gtest(moeLoadBalancerTest runtime/moeLoadBalancerTest.cpp)
-
-add_gtest(sanitizerTest runtime/sanitizerTest.cpp)
-
-add_gtest(eaglePackDataTest kernels/eaglePackDataTest.cpp)
-
-add_gtest(medusaDecodeLayerTest layers/medusaDecodeLayerTest.cpp)
-
-add_gtest(moeLoadBalanceKernelTest kernels/moeLoadBalanceKernelTest.cpp)
-
-add_gtest(eagleLayerTest layers/eagleLayerTest.cpp)
-
 add_subdirectory(utils)
-
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/batch_manager)
-  add_subdirectory(batch_manager)
-endif()
-
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/executor)
-  add_subdirectory(executor)
-endif()
+add_subdirectory(unit_tests)
+add_subdirectory(e2e_tests)

cpp/tests/e2e_tests/CMakeLists.txt

@@ -0,0 +1,13 @@
+# SPDX-FileCopyrightText: Copyright (c) 2023-2024 NVIDIA CORPORATION &
+# AFFILIATES. All rights reserved. SPDX-License-Identifier: NVIDIA TensorRT
+# Source Code License Agreement
+#
+# NVIDIA CORPORATION, its affiliates and licensors retain all intellectual
+# property and proprietary rights in and to this material, related documentation
+# and any modifications thereto. Any use, reproduction, disclosure or
+# distribution of this material and related documentation without an express
+# license agreement from NVIDIA CORPORATION or its affiliates is strictly
+# prohibited.
+
+add_subdirectory(batch_manager)
+add_subdirectory(executor)

cpp/tests/batch_manager/CMakeLists.txt renamed to cpp/tests/e2e_tests/batch_manager/CMakeLists.txt

@@ -9,13 +9,10 @@
 # license agreement from NVIDIA CORPORATION or its affiliates is strictly
 # prohibited.
 
-add_gtest(cacheTransceiverTest cacheTransceiverTest.cpp)
-
+# guidedDecoderTest requires model tokenizer info, so it's easier to run it with
+# e2e tests instead of unit tests.
+add_gtest(guidedDecoderTest guidedDecoderTest.cpp)
+add_gtest(trtEncoderModelTest trtEncoderModelTest.cpp)
 add_gtest(trtGptModelTest trtGptModelTest.cpp)
 add_gtest(trtGptModelRealDecoderTest trtGptModelRealDecoderTest.cpp)
 target_link_libraries(trtGptModelRealDecoderTest PRIVATE testingUtils)
-
-add_gtest(peftCacheManagerTest peftCacheManagerTest.cpp)
-add_gtest(trtEncoderModelTest trtEncoderModelTest.cpp)
-add_gtest(guidedDecoderTest guidedDecoderTest.cpp)
-add_gtest(blockKeyTest blockKeyTest.cpp)

cpp/tests/batch_manager/guidedDecoderTest.cpp renamed to cpp/tests/e2e_tests/batch_manager/guidedDecoderTest.cpp

@@ -1405,7 +1405,7 @@ INSTANTIATE_TEST_SUITE_P(LlamaCon2TP1Gen1TP2PP2DisaaggOrchestrator, DisaggOrches
         ),
     generateTestNameDisaggParams);
 
-INSTANTIATE_TEST_SUITE_P(LlamaCon2TP2Gen2TP1DisaaggSpawnOrchestrator, DisaggOrchestratorParamsTest,
+INSTANTIATE_TEST_SUITE_P(LlamaCon2TP2Gen2TP1DisaggSpawnOrchestrator, DisaggOrchestratorParamsTest,
     testing::Combine(                                                                                      //
         testing::Values(1),                                                                                // processNum
         testing::Values(
@@ -1418,7 +1418,7 @@ INSTANTIATE_TEST_SUITE_P(LlamaCon2TP2Gen2TP1DisaaggSpawnOrchestrator, DisaggOrch
         ),
     generateTestNameDisaggParams);
 
-INSTANTIATE_TEST_SUITE_P(LlamaCon2TP1Gen2PP2DisaaggSpawnOrchestrator, DisaggOrchestratorParamsTest,
+INSTANTIATE_TEST_SUITE_P(LlamaCon2TP1Gen2PP2DisaggSpawnOrchestrator, DisaggOrchestratorParamsTest,
     testing::Combine(                                                                                      //
         testing::Values(1),                                                                                // processNum
         testing::Values(