[modular] Fix the prefix-based renaming if the old and new model share a common name suffix #37829
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
|
Hi 👋, thank you for opening this pull request! The pull request is converted to draft by default. The CI will be paused while the PR is in draft mode. When it is ready for review, please click the |
|
The docs for this PR live here. All of your documentation changes will be reflected on that endpoint. The docs are available until 30 days after the last update. |
Cyrilvallez
force-pushed
the
modular-prefix
branch
from
beb65a5 to
a08301e
Compare
Cyrilvallez
commented
Apr 28, 2025
Comment on lines
-32
to
-48
| # Check that adding the second base class correctly set the parent, even though in clip it does not have the "Vision" part | ||
| class Multimodal2VisionSdpaAttention(CLIPSdpaAttention, Multimodal2VisionAttention): | ||
| pass | ||
|
|
||
|
|
||
| # Check that adding the second base class correctly set the parent, even though in clip it does not have the "Vision" part | ||
| class Multimodal2VisionFlashAttention2(CLIPFlashAttention2, Multimodal2VisionAttention): | ||
| pass | ||
|
|
||
|
|
||
| MULTIMODAL2_VISION_ATTENTION_CLASSES = { | ||
| "eager": Multimodal2VisionAttention, | ||
| "sdpa": Multimodal2VisionSdpaAttention, | ||
| "flash_attention_2": Multimodal2VisionFlashAttention2, | ||
| } | ||
|
|
||
|
|
Member
Author
There was a problem hiding this comment.
They no longer exist
Comment on lines
+1768
to
+1778
| else: | ||
| for i, model_name in enumerate(args.files_to_parse): | ||
| if os.sep not in model_name: | ||
| full_path = os.path.join("src", "transformers", "models", model_name, f"modular_{model_name}.py") | ||
| # If it does not exist, try in the examples section | ||
| if not os.path.isfile(full_path): | ||
| full_path = os.path.join("examples", "modular-transformers", f"modular_{model_name}.py") | ||
| # We did not find it anywhere | ||
| if not os.path.isfile(full_path): | ||
| raise ValueError(f"Cannot find a modular file for {model_name}. Please provide the full path.") | ||
| args.files_to_parse[i] = full_path |
Member
Author
There was a problem hiding this comment.
Because I'm too lazy to write the full path each time. It allows to do e.g.
python utils/modular_model_converter.py --files_to_parse aria instead of python utils/modular_model_converter.py --files_to_parse src/transformers/models/aria/modular_aria.py
ArthurZucker
approved these changes
Apr 29, 2025
Comment on lines
+1768
to
+1778
| else: | ||
| for i, model_name in enumerate(args.files_to_parse): | ||
| if os.sep not in model_name: | ||
| full_path = os.path.join("src", "transformers", "models", model_name, f"modular_{model_name}.py") | ||
| # If it does not exist, try in the examples section | ||
| if not os.path.isfile(full_path): | ||
| full_path = os.path.join("examples", "modular-transformers", f"modular_{model_name}.py") | ||
| # We did not find it anywhere | ||
| if not os.path.isfile(full_path): | ||
| raise ValueError(f"Cannot find a modular file for {model_name}. Please provide the full path.") | ||
| args.files_to_parse[i] = full_path |
zucchini-nlp
pushed a commit
to zucchini-nlp/transformers
that referenced
this pull request
May 14, 2025
…e a common name suffix (huggingface#37829) * first try * Fix and set examples * style * fix * Update modular_test_detr.py * Update image_processing_new_imgproc_model.py * Update modular_model_converter.py
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
As per the title. See #36895 (comment) for details. It's mostly an issue for all the
detrmodels, as they share the suffix in the base name.cc @qubvel for viz!