Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
022c6b4
initial
ywang96 Jan 1, 2025
43fdf45
fix llava ov
ywang96 Jan 1, 2025
e0fb002
iterate
ywang96 Jan 1, 2025
a9b9757
Merge branch 'vllm-project:main' into v1-llava-ov
ywang96 Jan 2, 2025
b45010b
revert padding tensor
ywang96 Jan 2, 2025
d83e25e
simplify
ywang96 Jan 2, 2025
d13b0f7
comment
ywang96 Jan 2, 2025
7d1f19a
Merge branch 'vllm-project:main' into v1-llava-ov
ywang96 Jan 2, 2025
6959ec0
simplify and doc
ywang96 Jan 2, 2025
ba071c6
refactor logic
ywang96 Jan 3, 2025
ba2f399
format
ywang96 Jan 3, 2025
ff4cdea
Merge branch 'vllm-project:main' into v1-llava-ov
ywang96 Jan 3, 2025
2eebfd9
switch order
ywang96 Jan 3, 2025
20dd84d
refactor
ywang96 Jan 3, 2025
34ec194
typing
ywang96 Jan 3, 2025
9f19629
hasher
ywang96 Jan 3, 2025
66484aa
consolidate mm hasher
ywang96 Jan 4, 2025
1423f5f
typing
ywang96 Jan 4, 2025
ba17100
Merge branch 'vllm-project:main' into v1-llava-ov
ywang96 Jan 4, 2025
b3c41ce
Merge branch 'main' into v1-llava-ov
ywang96 Jan 5, 2025
14481fd
fix length check
ywang96 Jan 5, 2025
6f435cf
update profiling
ywang96 Jan 5, 2025
16e5b04
update dummy data for llava-ov
ywang96 Jan 5, 2025
612880b
preserve modality order
ywang96 Jan 5, 2025
3022754
format
ywang96 Jan 5, 2025
20d6a67
simplify
ywang96 Jan 5, 2025
3dd2db2
typo
ywang96 Jan 5, 2025
5ce6f7a
clarify
ywang96 Jan 5, 2025
4113e51
add test
ywang96 Jan 5, 2025
3ca30fc
fix test
ywang96 Jan 5, 2025
ef8c6d1
add note
ywang96 Jan 5, 2025
87f4216
Merge branch 'v1-llava-ov' of https://github.com/ywang96/vllm into v1…
ywang96 Jan 5, 2025
bc1debd
comment
ywang96 Jan 5, 2025
56a7ef0
typo
ywang96 Jan 5, 2025
568a586
rename
ywang96 Jan 5, 2025
6ca99a3
remove redundant constants
ywang96 Jan 5, 2025
6c8ff3b
update interface with note
ywang96 Jan 5, 2025
293b3fe
update doc
ywang96 Jan 5, 2025
14482bf
address review comments
ywang96 Jan 6, 2025
eeee402
use namedtuple
ywang96 Jan 6, 2025
7f4815e
add comment
ywang96 Jan 6, 2025
1ba40e9
update
ywang96 Jan 6, 2025
2eb4cf1
format
ywang96 Jan 6, 2025
fe71431
format
ywang96 Jan 6, 2025
1a7b39c
remove unneeded check
ywang96 Jan 6, 2025
61991b6
Merge branch 'main' into v1-llava-ov
ywang96 Jan 6, 2025
ceec26e
remove unused import
ywang96 Jan 6, 2025
7879952
restrict mm_hash to V1
ywang96 Jan 6, 2025
72ae769
fix test and reorder code for readability
ywang96 Jan 6, 2025
48811b6
typo
ywang96 Jan 6, 2025
b31fd4f
format
ywang96 Jan 6, 2025
be54b2c
Fix dummy requests
DarkLight1337 Jan 6, 2025
b2cbc5a
Pass sanity check
DarkLight1337 Jan 6, 2025
3400d07
format
DarkLight1337 Jan 6, 2025
2461f0f
Merge branch 'main' into v1-llava-ov
DarkLight1337 Jan 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove unneeded check
Signed-off-by: Roger Wang <ywang@roblox.com>
  • Loading branch information
ywang96 committed Jan 6, 2025
commit 1a7b39c24deeb183e9d8e00be7b3d69045f88a2c
3 changes: 1 addition & 2 deletions vllm/multimodal/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -482,8 +482,7 @@ def merge_and_sort_multimodal_metadata(
mm_hashes[modalities[0]])

placeholder_lists_with_modality = [(modality, mm_positions[modality])
for modality in modalities
if modality in mm_positions]
for modality in modalities]

if mm_hashes is None:
sorted_placeholder_lists = sorted(placeholder_lists_with_modality,
Expand Down