From dd2ad54060ed65edce8925beb62c5c59de1a1163 Mon Sep 17 00:00:00 2001 From: Krishnan Prashanth Date: Thu, 30 May 2024 10:04:09 -0700 Subject: [PATCH 1/4] Fixing dependency issues relating to pt 2 --- pyproject.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4e2d257..daf7cd2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,9 +47,10 @@ keywords = [] requires-python = ">=3.10,<4" # TODO: Add [gpu] set of dependencies for trtllm once it's available on pypi dependencies = [ + "grpcio>=1.64.0", "directory-tree == 0.0.4", # may remove in future "docker == 6.1.3", - "genai-perf @ git+https://github.com/triton-inference-server/client.git@r24.04#subdirectory=src/c++/perf_analyzer/genai-perf", + "genai-perf @ git+https://github.com/triton-inference-server/client.git@r24.05#subdirectory=src/c++/perf_analyzer/genai-perf", # TODO: rely on tritonclient to pull in protobuf and numpy dependencies? "numpy >= 1.21", "protobuf>=3.7.0", @@ -57,7 +58,7 @@ dependencies = [ "psutil >= 5.9.5", # may remove later "rich == 13.5.2", # TODO: Test on cpu-only machine if [cuda] dependency is an issue - "tritonclient[all] >= 2.45", + "tritonclient[all] >= 2.46", "huggingface-hub >= 0.19.4", # Testing "pytest >= 8.1.1", # may remove later From d4dd76256e4299f99211704c6660a23e52df89fe Mon Sep 17 00:00:00 2001 From: Krishnan Prashanth Date: Thu, 30 May 2024 11:17:14 -0700 Subject: [PATCH 2/4] Modifying parser arguments to match gen-ai perf analyzer --- src/triton_cli/profile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/triton_cli/profile.py b/src/triton_cli/profile.py index e5799c8..60cb575 100755 --- a/src/triton_cli/profile.py +++ b/src/triton_cli/profile.py @@ -50,7 +50,7 @@ def build_command(args: argparse.Namespace, executable: str): # Once GenAI-Perf releases 24.05, "tensorrtllm" as the backend value # will be supported by default. elif arg == "backend" and value in ["tensorrtllm", "trtllm"]: - cmd += ["--backend", "trtllm"] + cmd += ["--backend", "tensorrtllm"] else: if len(arg) == 1: cmd += [f"-{arg}", f"{value}"] From ad7c63888640e8911e4c59ab409df54024152681 Mon Sep 17 00:00:00 2001 From: Krishnan Prashanth Date: Thu, 30 May 2024 16:13:34 -0700 Subject: [PATCH 3/4] Adding Repo Tag --- .github/workflows/trigger_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trigger_ci.yml b/.github/workflows/trigger_ci.yml index 1c0ef20..992c705 100644 --- a/.github/workflows/trigger_ci.yml +++ b/.github/workflows/trigger_ci.yml @@ -17,4 +17,4 @@ jobs: - name: Trigger Pipeline run: | #!/bin/bash - curl --fail --request POST --form token=${{ secrets.PIPELINE_TOKEN }} -F ref=${GITHUB_HEAD_REF} -F variables[RULE_WORKFLOW]="DS_TEST_TRITON_CLI" "${{ secrets.PIPELINE_URL }}" + curl --fail --request POST --form token=${{ secrets.PIPELINE_TOKEN }} -F ref=${GITHUB_HEAD_REF} -F variables[TRITON_CLI_REPO_TAG]=${GITHUB_HEAD_REF} -F variables[RULE_WORKFLOW]="DS_TEST_TRITON_CLI" "${{ secrets.PIPELINE_URL }}" From 0afb2c781adf65fbc481940f31ad21de86071626 Mon Sep 17 00:00:00 2001 From: Krishnan Prashanth Date: Fri, 31 May 2024 09:02:22 -0700 Subject: [PATCH 4/4] Updating .toml file --- pyproject.toml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b9973b4..8ff31ce 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -57,12 +57,8 @@ dependencies = [ "prometheus-client == 0.19.0", "psutil >= 5.9.5", # may remove later "rich == 13.5.2", - # TODO: Test on cpu-only machine if [cuda] dependency is an issue -<<<<<<< kprashanth-dependency-fix + # TODO: Test on cpu-only machine if [cuda] dependency is an issue, "tritonclient[all] >= 2.46", -======= - "tritonclient[all] == 2.45.0", ->>>>>>> main "huggingface-hub >= 0.19.4", # Testing "pytest >= 8.1.1", # may remove later