Skip to content

Commit 09796b7

Browse files
Remove hardcoded paths
1 parent 2a79eda commit 09796b7

File tree

2 files changed

+10
-71
lines changed

2 files changed

+10
-71
lines changed

.github/workflows/ci_eval.yaml

+10-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,12 @@ jobs:
6767
iree-runtime \
6868
"numpy<2.0"
6969
- name: Run perplexity test with vmfb
70-
run: pytest -n 8 -v -s sharktank/tests/evaluate/perplexity_vmfb_test.py --iree-device='hip://7' --longrun
70+
run: pytest -n 8 -v -s sharktank/tests/evaluate/perplexity_vmfb_test.py \
71+
--longrun \
72+
--iree-device='hip://7' \
73+
--iree-hip-target='gfx942' \
74+
--llama3-8b-f16-model-path=/data/extra/models/llama3.1_8B/llama8b_f16.irpa \
75+
--llama3-8b-tokenizer-path=/data/extra/models/llama3.1_8B/tokenizer_config.json
7176

7277
# test_perplexity_torch:
7378
# timeout-minutes: 1000
@@ -113,4 +118,7 @@ jobs:
113118
# pip install --no-compile -r requirements.txt -r sharktank/requirements-tests.txt -e sharktank/
114119

115120
# - name: Run perplexity test in eager mode
116-
# run: pytest -n 8 -v -s sharktank/tests/evaluate/perplexity_torch_test.py --longrun
121+
# run: pytest -n 8 -v -s sharktank/tests/evaluate/perplexity_vmfb_test.py \
122+
# --longrun \
123+
# --llama3-8b-f16-model-path=/data/extra/models/llama3.1_8B/llama8b_f16.irpa \
124+
# --llama3-8b-tokenizer-path=/data/extra/models/llama3.1_8B/tokenizer_config.json

sharktank/conftest.py

-69
Original file line numberDiff line numberDiff line change
@@ -77,23 +77,13 @@ def pytest_addoption(parser):
7777
"--llama3-8b-tokenizer-path",
7878
type=Path,
7979
action="store",
80-
default="/data/llama-3.1/8b/tokenizer_config.json",
8180
help="Llama3.1 8b tokenizer path, defaults to 30F CI system path",
8281
)
8382

84-
parser.addoption(
85-
"--llama3-8b-json-path",
86-
type=Path,
87-
action="store",
88-
default="/data/extra/models/llama3.1_8B/llama8b_test.json",
89-
help="Llama3.1 8b fp8 parameters json path",
90-
)
91-
9283
parser.addoption(
9384
"--llama3-8b-f16-model-path",
9485
type=Path,
9586
action="store",
96-
default="/data/llama-3.1/8b/llama8b_f16.irpa",
9787
help="Llama3.1 8b model path, defaults to 30F CI system path",
9888
)
9989

@@ -105,51 +95,17 @@ def pytest_addoption(parser):
10595
help="Llama3.1 8b fp8 model path",
10696
)
10797

108-
parser.addoption(
109-
"--llama3-8b-f16-mlir-path",
110-
type=Path,
111-
action="store",
112-
default="/data/extra/models/llama3.1_8B/llama8b_f16_test.mlir",
113-
help="Llama3.1 8b mlir path, defaults to 30F CI system path",
114-
)
115-
116-
parser.addoption(
117-
"--llama3-8b-fp8-mlir-path",
118-
type=Path,
119-
action="store",
120-
default=None,
121-
help="Llama3.1 8b fp8 mlir path",
122-
)
123-
124-
parser.addoption(
125-
"--llama3-8b-f16-vmfb-path",
126-
type=Path,
127-
action="store",
128-
default="/data/extra/models/llama3.1_8B/llama8b_f16.vmfb",
129-
help="Llama3.1 8b fp16 vmfb path, defaults to 30F CI system path",
130-
)
131-
13298
parser.addoption(
13399
"--llama3-405b-tokenizer-path",
134100
type=Path,
135101
action="store",
136-
default="/data/llama-3.1/405b/tokenizer_config.json",
137102
help="Llama3.1 405b tokenizer path, defaults to 30F CI system path",
138103
)
139104

140-
parser.addoption(
141-
"--llama3-405b-json-path",
142-
type=Path,
143-
action="store",
144-
default="/data/extra/models/llama3.1_405B/llama405b_test.json",
145-
help="Llama3.1 405b fp8 parameters json path",
146-
)
147-
148105
parser.addoption(
149106
"--llama3-405b-f16-model-path",
150107
type=Path,
151108
action="store",
152-
default="/data/llama-3.1/405b/llama405b_fp16.irpa",
153109
help="Llama3.1 405b model path, defaults to 30F CI system path",
154110
)
155111

@@ -161,30 +117,6 @@ def pytest_addoption(parser):
161117
help="Llama3.1 405b fp8 model path",
162118
)
163119

164-
parser.addoption(
165-
"--llama3-405b-f16-mlir-path",
166-
type=Path,
167-
action="store",
168-
default="/data/extra/models/llama3.1_405B/llama405b_fp16_test.mlir",
169-
help="Llama3.1 405b mlir path, defaults to 30F CI system path",
170-
)
171-
172-
parser.addoption(
173-
"--llama3-405b-fp8-mlir-path",
174-
type=Path,
175-
action="store",
176-
default=None,
177-
help="Llama3.1 405b fp8 mlir path",
178-
)
179-
180-
parser.addoption(
181-
"--llama3-405b-f16-vmfb-path",
182-
type=Path,
183-
action="store",
184-
default="/data/extra/models/llama3.1_405B/llama405b_fp16.vmfb",
185-
help="Llama3.1 405b fp16 vmfb path, defaults to 30F CI system path",
186-
)
187-
188120
parser.addoption(
189121
"--baseline-perplexity-scores",
190122
type=Path,
@@ -203,7 +135,6 @@ def pytest_addoption(parser):
203135
parser.addoption(
204136
"--iree-hip-target",
205137
action="store",
206-
default="gfx942",
207138
help="Specify the iree-hip target version (e.g., gfx942)",
208139
)
209140

0 commit comments

Comments
 (0)