Skip to content

Commit 158d77e

Browse files
authored
Fix display from GB to GiB for consistency (#34)
1 parent a5ec090 commit 158d77e

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

src/hf_mem/print.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def _format_short_number(n: float) -> str:
105105
return f"{n:.2f}P"
106106

107107

108-
def _bytes_to_gb(nbytes: int) -> float:
108+
def _bytes_to_gib(nbytes: int) -> float:
109109
return nbytes / (1024**3)
110110

111111

@@ -127,33 +127,33 @@ def print_report(
127127
for name, nested_metadata in metadata.components.items():
128128
if len(metadata.components) > 1:
129129
centered_rows.append(
130-
f"{name.upper()} ({_format_short_number(nested_metadata.param_count)} PARAMS, {_bytes_to_gb(nested_metadata.bytes_count):.2f} GB)"
130+
f"{name.upper()} ({_format_short_number(nested_metadata.param_count)} PARAMS, {_bytes_to_gib(nested_metadata.bytes_count):.2f} GiB)"
131131
)
132132
elif cache:
133133
centered_rows.append(
134-
f"MODEL ({_format_short_number(nested_metadata.param_count)} PARAMS, {_bytes_to_gb(nested_metadata.bytes_count):.2f} GB)"
134+
f"MODEL ({_format_short_number(nested_metadata.param_count)} PARAMS, {_bytes_to_gib(nested_metadata.bytes_count):.2f} GiB)"
135135
)
136136
if cache:
137137
centered_rows.append(
138-
f"KV CACHE ({cache['max_model_len'] * cache['batch_size']} TOKENS, {_bytes_to_gb(cache['cache_size']):.2f} GB)"
138+
f"KV CACHE ({cache['max_model_len'] * cache['batch_size']} TOKENS, {_bytes_to_gib(cache['cache_size']):.2f} GiB)"
139139
)
140140

141141
data_rows = []
142142
if cache:
143143
data_rows.append(
144-
f"{_bytes_to_gb(combined_total):.2f} GB ({_format_short_number(metadata.param_count)} PARAMS + KV CACHE)"
144+
f"{_bytes_to_gib(combined_total):.2f} GiB ({_format_short_number(metadata.param_count)} PARAMS + KV CACHE)"
145145
)
146146
else:
147147
data_rows.append(
148-
f"{_bytes_to_gb(metadata.bytes_count):.2f} GB ({_format_short_number(metadata.param_count)} PARAMS)"
148+
f"{_bytes_to_gib(metadata.bytes_count):.2f} GiB ({_format_short_number(metadata.param_count)} PARAMS)"
149149
)
150150
for _, nested_metadata in metadata.components.items():
151151
for dtype, dtype_metadata in nested_metadata.dtypes.items():
152152
data_rows.append(
153-
f"{_bytes_to_gb(dtype_metadata.bytes_count):.2f} / {_bytes_to_gb(combined_total):.2f} GB"
153+
f"{_bytes_to_gib(dtype_metadata.bytes_count):.2f} / {_bytes_to_gib(combined_total):.2f} GiB"
154154
)
155155
if cache:
156-
data_rows.append(f"{_bytes_to_gb(cache['cache_size']):.2f} / {_bytes_to_gb(combined_total):.2f} GB")
156+
data_rows.append(f"{_bytes_to_gib(cache['cache_size']):.2f} / {_bytes_to_gib(combined_total):.2f} GiB")
157157

158158
max_centered_len = max(len(r) for r in centered_rows)
159159
max_data_len = max(len(r) for r in data_rows)
@@ -180,14 +180,12 @@ def print_report(
180180
_print_divider(data_col_width + 1, "top")
181181

182182
if cache:
183-
total_text = f"{_bytes_to_gb(combined_total):.2f} GB ({_format_short_number(metadata.param_count)} PARAMS + KV CACHE)"
183+
total_text = f"{_bytes_to_gib(combined_total):.2f} GiB ({_format_short_number(metadata.param_count)} PARAMS + KV CACHE)"
184184
total_bar = _make_bar(combined_total, combined_total, data_col_width)
185185
_print_row("TOTAL MEMORY", total_text, data_col_width)
186186
_print_row("REQUIREMENTS", total_bar, data_col_width)
187187
else:
188-
model_text = (
189-
f"{_bytes_to_gb(metadata.bytes_count):.2f} GB ({_format_short_number(metadata.param_count)} PARAMS)"
190-
)
188+
model_text = f"{_bytes_to_gib(metadata.bytes_count):.2f} GiB ({_format_short_number(metadata.param_count)} PARAMS)"
191189
model_bar = _make_bar(metadata.bytes_count, metadata.bytes_count, data_col_width)
192190
_print_row("TOTAL MEMORY", model_text, data_col_width)
193191
_print_row("REQUIREMENTS", model_bar, data_col_width)
@@ -196,14 +194,14 @@ def print_report(
196194
if len(metadata.components) > 1:
197195
_print_divider(data_col_width + 1, "top-continue")
198196
_print_centered(
199-
f"{key.upper()} ({_format_short_number(value.param_count)} PARAMS, {_bytes_to_gb(value.bytes_count):.2f} GB)",
197+
f"{key.upper()} ({_format_short_number(value.param_count)} PARAMS, {_bytes_to_gib(value.bytes_count):.2f} GiB)",
200198
current_len,
201199
)
202200
_print_divider(data_col_width + 1, "top")
203201
elif cache:
204202
_print_divider(data_col_width + 1, "top-continue")
205203
_print_centered(
206-
f"MODEL ({_format_short_number(value.param_count)} PARAMS, {_bytes_to_gb(value.bytes_count):.2f} GB)",
204+
f"MODEL ({_format_short_number(value.param_count)} PARAMS, {_bytes_to_gib(value.bytes_count):.2f} GiB)",
207205
current_len,
208206
)
209207
_print_divider(data_col_width + 1, "top")
@@ -217,16 +215,18 @@ def print_report(
217215
]
218216
)
219217
for idx, (dtype, dtype_metadata) in enumerate(value.dtypes.items()):
220-
gb_text = f"{_bytes_to_gb(dtype_metadata.bytes_count):.2f} / {_bytes_to_gb(combined_total):.2f} GB"
218+
gib_text = (
219+
f"{_bytes_to_gib(dtype_metadata.bytes_count):.2f} / {_bytes_to_gib(combined_total):.2f} GiB"
220+
)
221221
_print_row(
222222
dtype.upper() + " " * (max_length - len(dtype)),
223-
gb_text,
223+
gib_text,
224224
data_col_width,
225225
)
226226

227227
bar = _make_bar(
228-
_bytes_to_gb(dtype_metadata.bytes_count),
229-
_bytes_to_gb(combined_total),
228+
_bytes_to_gib(dtype_metadata.bytes_count),
229+
_bytes_to_gib(combined_total),
230230
data_col_width,
231231
)
232232
_print_row(
@@ -241,12 +241,12 @@ def print_report(
241241
if cache:
242242
_print_divider(data_col_width + 1, "top-continue")
243243
_print_centered(
244-
f"KV CACHE ({cache['max_model_len'] * cache['batch_size']} TOKENS, {_bytes_to_gb(cache['cache_size']):.2f} GB)",
244+
f"KV CACHE ({cache['max_model_len'] * cache['batch_size']} TOKENS, {_bytes_to_gib(cache['cache_size']):.2f} GiB)",
245245
current_len,
246246
)
247247
_print_divider(data_col_width + 1, "top")
248248

249-
kv_text = f"{_bytes_to_gb(cache['cache_size']):.2f} / {_bytes_to_gb(combined_total):.2f} GB"
249+
kv_text = f"{_bytes_to_gib(cache['cache_size']):.2f} / {_bytes_to_gib(combined_total):.2f} GiB"
250250
_print_row(
251251
cache["cache_dtype"].upper() + " " * (max_length - len(cache["cache_dtype"])), # type: ignore
252252
kv_text,

0 commit comments

Comments
 (0)