Commit ·
37f911f
1
Parent(s): 6ac0d0d
chore: clean up pre-5.3 transformers remnants
Browse files- input_embeds= → inputs_embeds= in create_causal_mask call (deprecated in 5.6)
- Remove LossKwargs try/except shim, use TransformersKwargs directly
- Simplify tokenizer import to top-level `from transformers import PreTrainedTokenizer`
- torch_dtype= → dtype= in inference/generate.py
- Delete commented-out dead imports in imageprocessor files
- Shorten outdated v4.54 deprecation warning in vision attention
imageprocessor_openpangu_vl.py
CHANGED
|
@@ -37,10 +37,6 @@ from transformers.image_utils import (
|
|
| 37 |
from torchvision.transforms.v2 import functional as F
|
| 38 |
import torch
|
| 39 |
from transformers.models.qwen2_vl.image_processing_qwen2_vl import smart_resize
|
| 40 |
-
# from transformers.image_processing_utils_fast import (
|
| 41 |
-
# group_images_by_shape,
|
| 42 |
-
# reorder_images,
|
| 43 |
-
# )
|
| 44 |
|
| 45 |
|
| 46 |
def rescale(image, scale):
|
|
|
|
| 37 |
from torchvision.transforms.v2 import functional as F
|
| 38 |
import torch
|
| 39 |
from transformers.models.qwen2_vl.image_processing_qwen2_vl import smart_resize
|
|
|
|
|
|
|
|
|
|
|
|
|
| 40 |
|
| 41 |
|
| 42 |
def rescale(image, scale):
|
inference/generate.py
CHANGED
|
@@ -17,7 +17,7 @@ key_mapping = {
|
|
| 17 |
model = AutoModelForCausalLM.from_pretrained(
|
| 18 |
model_path,
|
| 19 |
trust_remote_code=True,
|
| 20 |
-
|
| 21 |
key_mapping=key_mapping).eval().cuda()
|
| 22 |
|
| 23 |
conversation = [
|
|
|
|
| 17 |
model = AutoModelForCausalLM.from_pretrained(
|
| 18 |
model_path,
|
| 19 |
trust_remote_code=True,
|
| 20 |
+
dtype='auto',
|
| 21 |
key_mapping=key_mapping).eval().cuda()
|
| 22 |
|
| 23 |
conversation = [
|
inference/requirements.txt
CHANGED
|
@@ -1,4 +1,4 @@
|
|
| 1 |
-
torch==2.
|
| 2 |
-
torch_npu==2.
|
| 3 |
-
transformers==
|
| 4 |
qwen_vl_utils==0.0.14
|
|
|
|
| 1 |
+
torch==2.7.1
|
| 2 |
+
torch_npu==2.7.1
|
| 3 |
+
transformers==5.3.0
|
| 4 |
qwen_vl_utils==0.0.14
|
inference/vllm_ascend/pangu_infer/models/vllm_ascend/imageprocessor_openpangu_vl.py
CHANGED
|
@@ -37,10 +37,6 @@ from transformers.image_utils import (
|
|
| 37 |
from torchvision.transforms.v2 import functional as F
|
| 38 |
import torch
|
| 39 |
from transformers.models.qwen2_vl.image_processing_qwen2_vl import smart_resize
|
| 40 |
-
# from transformers.image_processing_utils_fast import (
|
| 41 |
-
# group_images_by_shape,
|
| 42 |
-
# reorder_images,
|
| 43 |
-
# )
|
| 44 |
|
| 45 |
|
| 46 |
def rescale(image, scale):
|
|
|
|
| 37 |
from torchvision.transforms.v2 import functional as F
|
| 38 |
import torch
|
| 39 |
from transformers.models.qwen2_vl.image_processing_qwen2_vl import smart_resize
|
|
|
|
|
|
|
|
|
|
|
|
|
| 40 |
|
| 41 |
|
| 42 |
def rescale(image, scale):
|
modeling_openpangu_embedded.py
CHANGED
|
@@ -56,12 +56,7 @@ from transformers.processing_utils import Unpack
|
|
| 56 |
from transformers.utils import TransformersKwargs, auto_docstring, can_return_tuple, logging
|
| 57 |
from transformers.configuration_utils import PretrainedConfig
|
| 58 |
|
| 59 |
-
|
| 60 |
-
from transformers.utils import LossKwargs
|
| 61 |
-
except ImportError:
|
| 62 |
-
# Transformers 5.3 exposes the generic kwargs TypedDict but no longer exports
|
| 63 |
-
# the loss-specific alias used by upstream OpenPangu code.
|
| 64 |
-
LossKwargs = TransformersKwargs
|
| 65 |
|
| 66 |
|
| 67 |
def _compute_default_rope_parameters(config, device=None, seq_len=None, layer_type=None):
|
|
@@ -599,7 +594,7 @@ class PanguEmbeddedModel(PanguEmbeddedPreTrainedModel):
|
|
| 599 |
|
| 600 |
causal_mask = create_causal_mask(
|
| 601 |
config=self.config,
|
| 602 |
-
|
| 603 |
attention_mask=attention_mask,
|
| 604 |
cache_position=cache_position,
|
| 605 |
past_key_values=past_key_values
|
|
|
|
| 56 |
from transformers.utils import TransformersKwargs, auto_docstring, can_return_tuple, logging
|
| 57 |
from transformers.configuration_utils import PretrainedConfig
|
| 58 |
|
| 59 |
+
LossKwargs = TransformersKwargs
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 60 |
|
| 61 |
|
| 62 |
def _compute_default_rope_parameters(config, device=None, seq_len=None, layer_type=None):
|
|
|
|
| 594 |
|
| 595 |
causal_mask = create_causal_mask(
|
| 596 |
config=self.config,
|
| 597 |
+
inputs_embeds=inputs_embeds,
|
| 598 |
attention_mask=attention_mask,
|
| 599 |
cache_position=cache_position,
|
| 600 |
past_key_values=past_key_values
|
modeling_openpangu_vl.py
CHANGED
|
@@ -42,12 +42,7 @@ from transformers.processing_utils import Unpack
|
|
| 42 |
from transformers.utils import TransformersKwargs, auto_docstring, can_return_tuple, logging
|
| 43 |
from transformers.utils.import_utils import is_torchdynamo_compiling
|
| 44 |
|
| 45 |
-
|
| 46 |
-
from transformers.utils import LossKwargs
|
| 47 |
-
except ImportError:
|
| 48 |
-
# Transformers 5.3 exposes the generic kwargs TypedDict but no longer exports
|
| 49 |
-
# the loss-specific alias used by upstream OpenPangu code.
|
| 50 |
-
LossKwargs = TransformersKwargs
|
| 51 |
|
| 52 |
|
| 53 |
def _compute_default_rope_parameters(config, device=None, seq_len=None, layer_type=None):
|
|
@@ -245,10 +240,7 @@ class OpenPanguVLVisionAttention(nn.Module):
|
|
| 245 |
)
|
| 246 |
if position_embeddings is None:
|
| 247 |
logger.warning_once(
|
| 248 |
-
"
|
| 249 |
-
"through `rotary_pos_emb` (2D tensor of RoPE theta values), to using externally computed "
|
| 250 |
-
"`position_embeddings` (Tuple of tensors, containing cos and sin). In v4.54 `rotary_pos_emb` will be "
|
| 251 |
-
"removed and `position_embeddings` will be mandatory."
|
| 252 |
)
|
| 253 |
emb = torch.cat((rotary_pos_emb, rotary_pos_emb), dim=-1)
|
| 254 |
cos = emb.cos()
|
|
|
|
| 42 |
from transformers.utils import TransformersKwargs, auto_docstring, can_return_tuple, logging
|
| 43 |
from transformers.utils.import_utils import is_torchdynamo_compiling
|
| 44 |
|
| 45 |
+
LossKwargs = TransformersKwargs
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 46 |
|
| 47 |
|
| 48 |
def _compute_default_rope_parameters(config, device=None, seq_len=None, layer_type=None):
|
|
|
|
| 240 |
)
|
| 241 |
if position_embeddings is None:
|
| 242 |
logger.warning_once(
|
| 243 |
+
"`rotary_pos_emb` is deprecated; pass `position_embeddings` (cos, sin) instead."
|
|
|
|
|
|
|
|
|
|
| 244 |
)
|
| 245 |
emb = torch.cat((rotary_pos_emb, rotary_pos_emb), dim=-1)
|
| 246 |
cos = emb.cos()
|
tokenization_openpangu.py
CHANGED
|
@@ -26,10 +26,7 @@ from typing import Any, Dict, List, Optional, Tuple
|
|
| 26 |
|
| 27 |
import sentencepiece as spm
|
| 28 |
|
| 29 |
-
|
| 30 |
-
from transformers.tokenization_python import PreTrainedTokenizer # type: ignore[reportMissingImports]
|
| 31 |
-
except ImportError:
|
| 32 |
-
from transformers.tokenization_utils import PreTrainedTokenizer # type: ignore[reportMissingImports]
|
| 33 |
from transformers.utils import logging
|
| 34 |
|
| 35 |
|
|
|
|
| 26 |
|
| 27 |
import sentencepiece as spm
|
| 28 |
|
| 29 |
+
from transformers import PreTrainedTokenizer
|
|
|
|
|
|
|
|
|
|
| 30 |
from transformers.utils import logging
|
| 31 |
|
| 32 |
|