Second attempt at fixing model_repo issue

triton-inference-server · Aug 11, 2023 · 6fccc79 · 6fccc79
1 parent f640e10
commit 6fccc79
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/model_analyzer/entrypoint.py b/model_analyzer/entrypoint.py
@@ -135,9 +135,7 @@ def get_triton_handles(config, gpus):
 
     client = get_client_handle(config)
     fail_if_server_already_running(client, config)
-    server = TritonServerFactory.get_server_handle(
-        config, gpus, use_model_repository=bool(config.model_repository)
-    )
+    server = TritonServerFactory.get_server_handle(config, gpus)
 
     return client, server
 

diff --git a/model_analyzer/triton/server/server_factory.py b/model_analyzer/triton/server/server_factory.py
@@ -129,11 +129,11 @@ def get_server_handle(config, gpus, use_model_repository=False):
             server = TritonServerFactory._get_remote_server_handle(config)
         elif config.triton_launch_mode == "local":
             server = TritonServerFactory._get_local_server_handle(
-                config, gpus, use_model_repository
+                config, gpus, use_model_repository=True
             )
         elif config.triton_launch_mode == "docker":
             server = TritonServerFactory._get_docker_server_handle(
-                config, gpus, use_model_repository
+                config, gpus, use_model_repository=True
             )
         elif config.triton_launch_mode == "c_api":
             server = TritonServerFactory._get_c_api_server_handle(
@@ -178,6 +178,8 @@ def _get_local_server_handle(config, gpus, use_model_repository):
         triton_config = TritonServerConfig()
         triton_config.update_config(config.triton_server_flags)
 
+        assert use_model_repository and config.model_repository
+
         triton_config["model-repository"] = (
             config.model_repository
             if use_model_repository

diff --git a/tests/test_triton_server_factory.py b/tests/test_triton_server_factory.py
@@ -28,7 +28,10 @@ class TestTritonServerFactory(trc.TestResultCollector):
     def setUp(self):
         # Mock path validation
         self.mock_os = MockOSMethods(
-            mock_paths=["model_analyzer.triton.server.server_factory"]
+            mock_paths=[
+                "model_analyzer.triton.server.server_factory",
+                "model_analyzer.config.input.config_utils",
+            ]
         )
         self.mock_os.start()
 
@@ -53,6 +56,7 @@ def _test_get_server_handle_helper(
         """
 
         config = ConfigCommandProfile()
+        config.model_repository = "/fake_model_repository"
         config.triton_launch_mode = launch_mode
         config.triton_http_endpoint = "fake_address:2345"
         config.triton_grpc_endpoint = "fake_address:4567"