Skip to content

Commit a2bbbc6

Browse files
authored
Fix benchmark_e2e (microsoft#1702)
(1) benchmark_e2e breaks after the PR merge microsoft#1627 We need to apply chat template when we generate prompt using input model. (2) Also deprecate `pkg_resources` as it is going to be deprecated.
1 parent b3ddb21 commit a2bbbc6

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

benchmark/python/benchmark_e2e.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ def monitor_cpu_memory():
6868

6969
# Use input model to generate prompt
7070
def generate_prompt(model, tokenizer, prompt_length) -> str:
71-
prompt = "a"
71+
text = "a"
72+
prompt = f'{args.chat_template.format(input=text)}'
7273
tokens = tokenizer.encode(prompt)
7374
params=og.GeneratorParams(model)
7475
max_length_to_use = prompt_length + len(tokens)
@@ -89,14 +90,13 @@ def get_prompt_by_length(prompt_length):
8990

9091
def get_target_pip_package_version(target_pip_package_name_list):
9192
# get package name and version
92-
import pkg_resources
93+
import importlib.metadata
9394

94-
installed_packages = pkg_resources.working_set
9595
installed_packages_list = sorted(
9696
[
97-
f"{i.key}=={i.version}"
98-
for i in installed_packages
99-
if i.key in target_pip_package_name_list
97+
f"{dist.metadata['Name']}=={dist.version}"
98+
for dist in importlib.metadata.distributions()
99+
if dist.metadata["Name"] in target_pip_package_name_list
100100
]
101101
)
102102

0 commit comments

Comments
 (0)