Fixing merge conflicts

triton-inference-server · Mar 6, 2024 · 6cc3e43 · 6cc3e43
1 parent ee9ef1d
commit 6cc3e43
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/src/c++/perf_analyzer/genai-pa/genai_pa/llm_inputs/llm_inputs.py b/src/c++/perf_analyzer/genai-pa/genai_pa/llm_inputs/llm_inputs.py
@@ -550,17 +550,13 @@ def _create_empty_vllm_pa_json(cls) -> Dict:
         return empty_pa_json
 
     @classmethod
-<<<<<<< HEAD
-    def _create_new_openai_chat_completions_message(
-=======
     def _create_empty_trtllm_pa_json(cls) -> Dict:
         empty_pa_json = deepcopy(LlmInputs.EMPTY_JSON_IN_TRTLLM_PA_FORMAT)
 
         return empty_pa_json
 
     @classmethod
-    def _create_new_message(
->>>>>>> 53db856 (Adding trtllm endpoint support)
+    def _create_new_openai_chat_completions_message(
         cls,
         header: str,
         system_role_headers: List[str],
@@ -682,10 +678,6 @@ def _add_optional_tags_to_vllm_json(
         return pa_json
 
     @classmethod
-<<<<<<< HEAD
-    def _check_for_dataset_name_if_input_type_is_url(
-        cls, input_type: InputType, dataset_name: str
-=======
     def _add_optional_tags_to_trtllm_json(
         cls,
         pa_json: Dict,
@@ -712,9 +704,8 @@ def _add_required_tags_to_trtllm_json(
         return pa_json
 
     @classmethod
-    def _check_for_model_name_if_input_type_is_url(
-        cls, input_type: InputType, model_name: str
->>>>>>> 53db856 (Adding trtllm endpoint support)
+    def _check_for_dataset_name_if_input_type_is_url(
+        cls, input_type: InputType, dataset_name: str
     ) -> None:
         if input_type == InputType.URL and not dataset_name:
             raise GenAiPAException(

diff --git a/src/c++/perf_analyzer/genai-pa/tests/test_llm_inputs.py b/src/c++/perf_analyzer/genai-pa/tests/test_llm_inputs.py
@@ -250,12 +250,12 @@ def test_create_openai_to_trtllm(self):
             input_type=InputType.URL,
             input_format=InputFormat.OPENAI,
             output_format=OutputFormat.TRTLLM,
-            model_name=OPEN_ORCA,
+            dataset_name=OPEN_ORCA,
             add_model_name=False,
             add_stream=True,
         )
 
         os.remove(DEFAULT_INPUT_DATA_JSON)
 
         assert pa_json is not None
-        assert len(pa_json["data"]) == LlmInputs.DEFAULT_LENGTH
+        assert len(pa_json["data"]) == LlmInputs.DEFAULT_LENGTH