optimum-rbln 0.1.13__py3-none-any.whl → 0.1.15__py3-none-any.whl

optimum/rbln/transformers/models/phi/phi_architecture.py

@@ -21,302 +21,102 @@
 # copied, modified, or distributed without prior written permission
 # from Rebellions Inc.
 
-import math
-from typing import Dict, Optional, Tuple
+from typing import TYPE_CHECKING, Optional, Tuple
 
 import torch
-import torch.nn as nn
-from transformers.modeling_outputs import (
-    BaseModelOutputWithPast,
-)
+from transformers import PhiForCausalLM
 
-from ...cache_utils import RebelDynamicCache
-from ..decoderonly import (
+from ..decoderonly.decoderonly_architecture import (
+    DecoderOnlyAttention,
+    DecoderOnlyForCausalLM,
+    DecoderOnlyLayer,
+    DecoderOnlyModel,
     DecoderOnlyWrapper,
-    apply_rotary_pos_emb,
-    slice_and_unsqueeze_cos_sin,
+    apply_rotary_pos_emb_partial,
 )
 
 
-class PhiWrapper(DecoderOnlyWrapper):
-    def get_forward_dict(self):
-        forward_dict = {}
-        forward_dict.update(
-            {
-                "wrapper": PhiModel.forward,
-                "model": PhiDecoderLayer.forward,
-                "decoder_layer": PhiAttention.forward,
-            }
-        )
-        return forward_dict
-
-
-class PhiAttention:
-    def _attn(self, query_state, key_state, value_state, attn_mask, past_key_value, batch_idx=0, is_prefill=False):
-        # reshape for removing repeat_kv (batch=1 , num_head, 1, q_len=1, head_dim)
-        key_state = key_state.unsqueeze(2)
-        value_state = value_state.unsqueeze(2)
-        attn_mask = attn_mask.unsqueeze(2)
-
-        query_state = query_state.view(
-            1,
-            self.num_key_value_heads,
-            self.num_heads // self.num_key_value_heads,
-            -1,
-            self.head_dim,
-        )
-
-        key_state, value_state = past_key_value.update(key_state, value_state, self.layer_idx, batch_idx, is_prefill)
-
-        # Queries and keys upcast to fp32 is required by Phi-2 to avoid overflow
-        attn_weights = torch.matmul(
-            query_state.to(torch.float32),
-            key_state.to(torch.float32).transpose(3, 4),
-        ) / math.sqrt(self.head_dim)
-        attn_weights = attn_weights + attn_mask
-
-        # upcast attention to fp32
-        attn_weights = nn.functional.softmax(attn_weights, dim=-1, dtype=torch.float32).to(query_state.dtype)
-        attn_weights = nn.functional.dropout(attn_weights, p=self.attention_dropout, training=self.training)
-        attn_output = torch.matmul(attn_weights, value_state)
-
-        # reshape for removing repeat_kv
-        attn_output = attn_output.view(1, self.num_heads, -1, self.head_dim)
-        attn_output = attn_output.transpose(1, 2).contiguous()
-        attn_output = attn_output.reshape(1, -1, self.num_heads * self.head_dim)
+if TYPE_CHECKING:
+    from transformers import PhiForCausalLM
 
-        return attn_output, key_state, value_state
-
-    def forward(
-        self,
-        hidden_states: torch.Tensor,
-        attention_mask: Optional[torch.Tensor] = None,
-        past_key_value: Optional[RebelDynamicCache] = None,
-        batch_index: Optional[int] = None,
-        output_attentions: bool = False,
-        cos: Optional[torch.Tensor] = None,
-        sin: Optional[torch.Tensor] = None,
-        **kwargs,
-    ) -> Tuple[torch.Tensor, Optional[torch.Tensor], Optional[Tuple[torch.Tensor]]]:
-        bsz, q_len, _ = hidden_states.size()
 
+class PhiWrapper(DecoderOnlyWrapper):
+    def convert_to_rbln_causal_lm(self, causal_lm: "PhiForCausalLM"):
+        new_layers = []
+        for layer in causal_lm.model.layers:
+            if self.attn_impl == "eager":
+                new_self_attn = PhiAttention(layer.self_attn)
+            elif self.attn_impl == "flash_attn":
+                raise NotImplementedError(f"flash attn for {self.__class__} is not implemented yet.")
+            else:
+                raise NotImplementedError(f"Unknwon attn : {self.attn_impl}")
+            new_layer = PhiLayer(layer, new_self_attn)
+            new_layers.append(new_layer)
+        new_model = PhiModel(causal_lm.model, new_layers)
+        new_causal_lm = DecoderOnlyForCausalLM(causal_lm, new_model)
+        return new_causal_lm
+
+
+class PhiAttention(DecoderOnlyAttention):
+    def __post_init__(self):
+        self.q_proj = self._original_mod.q_proj
+        self.k_proj = self._original_mod.k_proj
+        self.v_proj = self._original_mod.v_proj
+        self.o_proj = self._original_mod.dense
+        self.qk_layernorm = self._original_mod.qk_layernorm
+        self.rotary_ndims = self._original_mod.rotary_ndims
+        self.num_key_value_heads = self.num_heads
+
+    def projection(self, hidden_states) -> Tuple[torch.Tensor, torch.Tensor, torch.Tensor]:
         query_states = self.q_proj(hidden_states)
         key_states = self.k_proj(hidden_states)
         value_states = self.v_proj(hidden_states)
 
         if self.qk_layernorm:
-            query_states = self.q_layernorm(query_states)
-            key_states = self.k_layernorm(key_states)
-
-        query_states = query_states.view(bsz, q_len, self.num_heads, self.head_dim).transpose(1, 2)
-        key_states = key_states.view(bsz, q_len, self.num_key_value_heads, self.head_dim).transpose(1, 2)
-        value_states = value_states.view(bsz, q_len, self.num_key_value_heads, self.head_dim).transpose(1, 2)
-
-        # Partial rotary embedding
-        query_rot, query_pass = (
-            query_states[..., : self.rotary_ndims],
-            query_states[..., self.rotary_ndims :],
-        )
-        key_rot, key_pass = (
-            key_states[..., : self.rotary_ndims],
-            key_states[..., self.rotary_ndims :],
-        )
+            query_states = self._original_mod.q_layernorm(query_states)
+            key_states = self._original_mod.k_layernorm(key_states)
 
-        # [batch_size, seq_length, num_heads, head_dim // config.partial_rotary_factor]
-        query_rot, key_rot = apply_rotary_pos_emb(query_rot, key_rot, cos, sin)
+        return query_states, key_states, value_states
 
-        # [batch_size, seq_length, num_heads, head_dim]
-        query_states = torch.cat((query_rot, query_pass), dim=-1)
-        key_states = torch.cat((key_rot, key_pass), dim=-1)
+    def apply_rotary_pos_embed(self, query_states, key_states, cos, sin):
+        return apply_rotary_pos_emb_partial(query_states, key_states, cos, sin, ndim=self.rotary_ndims)
 
-        # Decoder (bsz > 1)
-        if bsz > 1:
-            iterate_results = {"key_states": [], "value_states": [], "attn_output": []}
-            for b in range(bsz):
-                attn_output, key_state, value_state = PhiAttention._attn(
-                    self,
-                    query_states[b].unsqueeze(0),
-                    key_states[b].unsqueeze(0),
-                    value_states[b].unsqueeze(0),
-                    attention_mask[b].unsqueeze(0),
-                    past_key_value,
-                    batch_idx=b,
-                    is_prefill=False,
-                )
-                iterate_results["key_states"].append(key_state)
-                iterate_results["value_states"].append(value_state)
-                iterate_results["attn_output"].append(attn_output)
 
-            key_states = torch.cat(iterate_results["key_states"], dim=0)
-            value_states = torch.cat(iterate_results["value_states"], dim=0)
-            attn_output = torch.cat(iterate_results["attn_output"], dim=0)
-        # Prefill & Decoder (bsz == 1)
-        else:
-            attn_output, key_states, value_states = PhiAttention._attn(
-                self,
-                query_states,
-                key_states,
-                value_states,
-                attention_mask,
-                past_key_value,
-                batch_idx=batch_index,
-                is_prefill=True,
-            )
+class PhiLayer(DecoderOnlyLayer):
+    def get_post_attention_layernorm(self):
+        raise NotImplementedError
 
-        attn_output = self.dense(attn_output)
-
-        if not output_attentions:
-            attn_weights = None
-
-        return attn_output, attn_weights, key_states, value_states
-
-
-class PhiDecoderLayer:
     def forward(
         self,
         hidden_states: torch.Tensor,
-        layer_idx: int,
-        attention_mask: Optional[torch.Tensor] = None,
-        position_ids: Optional[torch.LongTensor] = None,
-        past_key_value: Optional[RebelDynamicCache] = None,
-        output_attentions: Optional[bool] = None,
-        use_cache: Optional[bool] = None,
-        batch_ids: Optional[torch.LongTensor] = None,
+        attention_mask: torch.Tensor,
+        current_steps: torch.LongTensor,
+        batch_position: torch.Tensor,
+        past_key_values: Tuple[Tuple[torch.Tensor]],
         cos: Optional[torch.Tensor] = None,
         sin: Optional[torch.Tensor] = None,
-        forward_dict: Optional[Dict[str, classmethod]] = None,
-        **kwargs,
-    ) -> Tuple[torch.FloatTensor, Optional[Tuple[torch.FloatTensor, torch.FloatTensor]]]:
-        """
-        Args:
-            hidden_states (`torch.FloatTensor`):
-                input to the layer of shape `(batch, seq_len, embed_dim)`
-            attention_mask (`torch.FloatTensor`, *optional*): attention mask of size
-                `(batch, 1, tgt_len, src_len)` where padding elements are indicated by very large negative values.
-            position_ids (`torch.LongTensor` of shape `({0})`, *optional*):
-                Indices of positions of each input sequence tokens in the position embeddings. Selected in the range
-                `[0, config.n_positions - 1]`. [What are position IDs?](../glossary#position-ids)
-            output_attentions (`bool`, *optional*):
-                Whether or not to return the attentions tensors of all attention layers. See `attentions` under
-                returned tensors for more detail.
-            use_cache (`bool`, *optional*):
-                If set to `True`, `past_key_values` key value states are returned and can be used to speed up decoding
-                (see `past_key_values`).
-            past_key_value (`Tuple(torch.FloatTensor)`, *optional*): cached past key and value projection states
-        """
-
+    ):
         residual = hidden_states
 
-        hidden_states = self.input_layernorm(hidden_states)
+        hidden_states = self.get_pre_attention_layernorm()(hidden_states)
 
-        # Self Attention
-        attn_outputs, self_attn_weights, key_states, value_states = forward_dict["decoder_layer"](
-            self.self_attn,
+        attn_outputs, present_key_values = self.self_attn(
             hidden_states=hidden_states,
             attention_mask=attention_mask,
-            position_ids=position_ids,
-            past_key_value=past_key_value,
-            output_attentions=output_attentions,
-            batch_index=batch_ids,
-            use_cache=use_cache,
+            current_steps=current_steps,
+            batch_position=batch_position,
+            past_key_values=past_key_values,
             cos=cos,
             sin=sin,
-            **kwargs,
         )
-        past_key_value.assign(key_states, value_states, layer_idx)
 
-        attn_outputs = self.resid_dropout(attn_outputs)
+        feed_forward_hidden_states = self._original_mod.mlp(hidden_states)
 
-        feed_forward_hidden_states = self.resid_dropout(self.mlp(hidden_states))
         hidden_states = attn_outputs + feed_forward_hidden_states + residual
-        outputs = (hidden_states,)
-
-        if output_attentions:
-            outputs += (self_attn_weights,)
-
-        if use_cache:
-            outputs += (past_key_value,)
-
-        return outputs
-
-
-class PhiModel:
-    def forward(
-        self,
-        input_ids: torch.LongTensor = None,
-        attention_mask: Optional[torch.Tensor] = None,
-        position_ids: Optional[torch.LongTensor] = None,
-        past_key_values: Optional[RebelDynamicCache] = None,
-        batch_ids: Optional[torch.LongTensor] = None,
-        inputs_embeds: Optional[torch.FloatTensor] = None,
-        use_cache: Optional[bool] = True,
-        output_attentions: Optional[bool] = False,
-        output_hidden_states: Optional[bool] = False,
-        cache_pos_for_partitions: Optional[torch.Tensor] = None,
-        kvcache_partition_size: Optional[torch.Tensor] = None,
-        forward_dict: Optional[Dict[str, classmethod]] = None,
-        rotary_pos_emb=None,
-    ) -> BaseModelOutputWithPast:
-        # retrieve input_ids and inputs_embeds
-        if (input_ids is None) ^ (inputs_embeds is not None):
-            raise ValueError(
-                "You cannot specify both input_ids and inputs_embeds at the same time, and must specify either one"
-            )
-
-        # embed positions
-        if inputs_embeds is None:
-            inputs_embeds = self.embed_tokens(input_ids)
-
-        hidden_states = inputs_embeds
-        attention_mask = (1 - attention_mask) * torch.finfo(torch.float16).min
-
-        # get cos,sin vector
-        cos, sin = rotary_pos_emb(inputs_embeds, attention_mask.shape[-1])
-        cos, sin = slice_and_unsqueeze_cos_sin(cos, sin, position_ids)
-
-        # decoder layers
-        all_hidden_states = () if output_hidden_states else None
-        all_self_attns = () if output_attentions else None
-
-        for layer_idx, decoder_layer in enumerate(self.layers):
-            if output_hidden_states:
-                all_hidden_states += (hidden_states,)
-            layer_outputs = forward_dict["model"](
-                decoder_layer,
-                hidden_states,
-                layer_idx,
-                attention_mask=attention_mask,
-                position_ids=position_ids,
-                past_key_value=past_key_values,
-                output_attentions=output_attentions,
-                use_cache=use_cache,
-                batch_ids=batch_ids,
-                cos=cos,
-                sin=sin,
-                cache_pos_for_partitions=cache_pos_for_partitions,
-                kvcache_partition_size=kvcache_partition_size,
-                forward_dict=forward_dict,
-            )
 
-            hidden_states = layer_outputs[0]
+        return hidden_states, present_key_values
 
-            updated_cache = layer_outputs[2 if output_attentions else 1]
 
-            if output_attentions:
-                all_self_attns += (layer_outputs[1],)
-
-        hidden_states = self.final_layernorm(hidden_states)
-
-        # add hidden states from the last decoder layer
-        if output_hidden_states:
-            all_hidden_states += (hidden_states,)
-
-        # convert RebelDynamicCache to legacy Tuple[Tuple[torch.Tensor]]
-        next_cache = updated_cache.to_legacy_cache()
-
-        return BaseModelOutputWithPast(
-            last_hidden_state=hidden_states,
-            past_key_values=next_cache,
-            hidden_states=all_hidden_states,
-            attentions=all_self_attns,
-        )
+class PhiModel(DecoderOnlyModel):
+    def get_last_layernorm(self):
+        return self._original_mod.final_layernorm

optimum/rbln/transformers/models/seq2seq/modeling_seq2seq.py

@@ -31,7 +31,7 @@ import torch  # noqa: F401
 from transformers import AutoModelForSeq2SeqLM, GenerationConfig, PretrainedConfig, PreTrainedModel
 from transformers.modeling_outputs import BaseModelOutput, Seq2SeqLMOutput
 
-from ....modeling_base import RBLNModel
+from ....modeling import RBLNModel
 from ....modeling_config import DEFAULT_COMPILED_MODEL_NAME, RBLNCompileConfig, RBLNConfig
 from ....utils.runtime_utils import RBLNPytorchRuntime
 
@@ -346,51 +346,6 @@ class RBLNModelForSeq2SeqLM(RBLNModel, ABC):
 
         return Seq2SeqLMOutput(logits=lm_logits)
 
-    def vllm_forward(
-        self,
-        input_ids: torch.LongTensor = None,
-        cache_position: Union[List[torch.Tensor], torch.Tensor] = None,  # vllm keyword argument
-        batch_idx: Optional[torch.LongTensor] = None,
-        enc_lengths: List[int] = None,  # vllm return current attention_mask length
-        **kwargs,
-    ) -> Tuple[torch.FloatTensor]:
-        # When using vllm, need the output of the encoder (ex. vocab_size + 100) and use that value act as start_token_id in decoder (ex. vocab_size + 99)
-        # encoder
-        if batch_idx is not None:
-            enc_attention_mask = torch.zeros(1, self.rbln_config.model_cfg["enc_max_seq_len"], dtype=torch.float32)
-            enc_attention_mask[0][: enc_lengths[batch_idx] + 1] = 1
-            padding_need = self.rbln_config.model_cfg["enc_max_seq_len"] - input_ids.shape[-1]
-            input_ids = torch.nn.functional.pad(input_ids, (0, padding_need))
-            _ = self.encoder(input_ids, enc_attention_mask, batch_idx=batch_idx.to(torch.int32))
-            logits = torch.zeros(1, 1, self.config.vocab_size + 100)
-            logits[0][0][-1] = 1
-        # decoder
-        else:
-            input_ids[input_ids == (self.config.vocab_size + 99)] = self.config.decoder_start_token_id
-            cache_position[cache_position != 0] = cache_position[cache_position != 0] - 2
-
-            enc_attention_mask = torch.zeros(
-                self.rbln_config.model_cfg["batch_size"],
-                self.rbln_config.model_cfg["enc_max_seq_len"],
-                dtype=torch.float32,
-            )
-            dec_attention_mask = torch.zeros(
-                self.rbln_config.model_cfg["batch_size"],
-                self.rbln_config.model_cfg["dec_max_seq_len"],
-                dtype=torch.float32,
-            )
-            for batch_idx in range(self.rbln_config.model_cfg["batch_size"]):
-                enc_attention_mask[batch_idx, : enc_lengths[batch_idx] + 1] = 1
-
-            logits = self._forward_decoder(
-                attention_mask=enc_attention_mask,
-                decoder_input_ids=input_ids,
-                decoder_attention_mask=dec_attention_mask,
-                cache_position=cache_position,
-            ).logits
-
-        return Seq2SeqLMOutput(logits=logits)
-
     def _prepare_encoder_decoder_kwargs_for_generation(
         self,
         inputs_tensor: torch.Tensor,

optimum/rbln/transformers/models/t5/modeling_t5.py

@@ -22,17 +22,23 @@
 # from Rebellions Inc.
 
 import inspect
-from typing import TYPE_CHECKING, Any, Callable, Dict, Optional, Union
+from typing import TYPE_CHECKING, Any, Callable, Dict, Optional, Tuple, Union
 
+import torch
+import transformers
 from transformers import (
     AutoModelForTextEncoding,
     PretrainedConfig,
+    T5EncoderModel,
     T5ForConditionalGeneration,
 )
+from transformers.modeling_outputs import BaseModelOutput
 
-from ....modeling_base import RBLNModel
+from ....modeling import RBLNModel
 from ....modeling_config import RBLNCompileConfig, RBLNConfig
+from ....modeling_diffusers import RBLNDiffusionMixin
 from ....utils.logging import get_logger
+from ....utils.runtime_utils import RBLNPytorchRuntime
 from ...models.seq2seq import RBLNModelForSeq2SeqLM
 from .t5_architecture import T5Wrapper
 
@@ -43,8 +49,60 @@ if TYPE_CHECKING:
     from transformers import AutoFeatureExtractor, AutoProcessor, AutoTokenizer, PreTrainedModel
 
 
+class RBLNRuntimeModel(RBLNPytorchRuntime):
+    def forward(
+        self,
+        input_ids: torch.LongTensor,
+        attention_mask: torch.FloatTensor,
+        head_mask: torch.FloatTensor,
+        inputs_embeds: torch.FloatTensor,
+        **kwargs,
+    ):
+        return super().forward(
+            input_ids,
+            attention_mask,
+            head_mask,
+            inputs_embeds,
+            **kwargs,
+        )
+
+
+class T5EncoderWrapper(torch.nn.Module):
+    def __init__(self, model: "T5EncoderModel") -> None:
+        super().__init__()
+        self.model = model
+
+    def forward(self, *args, **kwargs):
+        kwargs.pop("return_dict", None)
+        return self.model(*args, **kwargs, return_dict=False)
+
+
 class RBLNT5EncoderModel(RBLNModel):
     auto_model_class = AutoModelForTextEncoding
+    rbln_model_input_names = ["input_ids", "attention_mask"]
+
+    def __post_init__(self, **kwargs):
+        self.model = RBLNRuntimeModel(runtime=self.model[0])
+
+    @classmethod
+    def wrap_model_if_needed(self, model: "PreTrainedModel", rbln_config: "RBLNConfig"):
+        return T5EncoderWrapper(model)
+
+    @classmethod
+    def update_rbln_config_using_pipe(cls, pipe: RBLNDiffusionMixin, rbln_config: Dict[str, Any]) -> Dict[str, Any]:
+        batch_size = rbln_config.get("batch_size", 1)
+        max_sequence_length = rbln_config.get("max_sequence_length", 256)
+        model_input_names = ["input_ids"]
+
+        rbln_config.update(
+            {
+                "batch_size": batch_size,
+                "max_seq_len": max_sequence_length,
+                "model_input_names": model_input_names,
+            }
+        )
+
+        return rbln_config
 
     @classmethod
     def _get_rbln_config(
@@ -54,6 +112,7 @@ class RBLNT5EncoderModel(RBLNModel):
         rbln_kwargs: Dict[str, Any] = {},
     ) -> RBLNConfig:
         rbln_max_seq_len = rbln_kwargs.get("max_seq_len", None)
+        rbln_model_input_names = rbln_kwargs.get("model_input_names", None)
         rbln_batch_size = rbln_kwargs.get("batch_size", None)
 
         max_position_embeddings = getattr(model_config, "n_positions", None)
@@ -71,12 +130,27 @@ class RBLNT5EncoderModel(RBLNModel):
         if max_position_embeddings is not None and rbln_max_seq_len > max_position_embeddings:
             raise ValueError("`rbln_max_seq_len` should be less or equal than max_position_embeddings!")
 
+        if rbln_model_input_names is None:
+            for tokenizer in preprocessors:
+                if hasattr(tokenizer, "model_input_names"):
+                    rbln_model_input_names = tokenizer.model_input_names
+                    break
+            if rbln_model_input_names is None and hasattr(cls, "rbln_model_input_names"):
+                rbln_model_input_names = cls.rbln_model_input_names
+            elif rbln_model_input_names is None and hasattr(cls, "rbln_model_input_names") is False:
+                original_model_class = getattr(transformers, model_config.architectures[0])
+                input_names_order = inspect.signature(original_model_class.forward).parameters.keys()
+                raise ValueError(
+                    "Specify the model input names obtained by the tokenizer via `rbln_model_input_names`, "
+                    f"and be sure to make the order of the inputs same as T5EncoderModel forward() arguments like ({list(input_names_order)})"
+                )
+
         if rbln_batch_size is None:
             rbln_batch_size = 1
 
         input_info = [
-            ("input_ids", [rbln_batch_size, rbln_max_seq_len], "int64"),
-            ("attention_mask", [rbln_batch_size, rbln_max_seq_len], "int64"),
+            (model_input_name, [rbln_batch_size, rbln_max_seq_len], "int64")
+            for model_input_name in rbln_model_input_names
         ]
 
         rbln_compile_config = RBLNCompileConfig(input_info=input_info)
@@ -90,6 +164,30 @@ class RBLNT5EncoderModel(RBLNModel):
         rbln_config.model_cfg.update({"max_seq_len": rbln_max_seq_len})
         return rbln_config
 
+    def forward(
+        self,
+        input_ids: Optional[torch.LongTensor] = None,
+        attention_mask: Optional[torch.FloatTensor] = None,
+        head_mask: Optional[torch.FloatTensor] = None,
+        inputs_embeds: Optional[torch.FloatTensor] = None,
+        output_attentions: Optional[bool] = None,
+        output_hidden_states: Optional[bool] = None,
+        return_dict: Optional[bool] = None,
+    ) -> Union[Tuple[torch.FloatTensor], BaseModelOutput]:
+        encoder_outputs = self.model(
+            input_ids=input_ids,
+            attention_mask=attention_mask,
+            inputs_embeds=inputs_embeds,
+            head_mask=head_mask,
+            output_attentions=output_attentions,
+            output_hidden_states=output_hidden_states,
+            return_dict=return_dict,
+        )
+        if not return_dict:
+            return (encoder_outputs,)
+        else:
+            return BaseModelOutput(last_hidden_state=encoder_outputs)
+
 
 class RBLNT5ForConditionalGeneration(RBLNModelForSeq2SeqLM):
     @classmethod

optimum/rbln/transformers/models/wav2vec2/modeling_wav2vec2.py

@@ -28,7 +28,7 @@ import torch
 from transformers import AutoModelForMaskedLM, PretrainedConfig, Wav2Vec2ForCTC
 from transformers.modeling_outputs import CausalLMOutput
 
-from ....modeling_base import RBLNModel
+from ....modeling import RBLNModel
 from ....modeling_config import RBLNCompileConfig, RBLNConfig
 
 

optimum/rbln/transformers/models/whisper/modeling_whisper.py

@@ -36,7 +36,7 @@ from transformers import (
 )
 from transformers.modeling_outputs import BaseModelOutput, Seq2SeqLMOutput
 
-from ....modeling_base import RBLNModel
+from ....modeling import RBLNModel
 from ....modeling_config import DEFAULT_COMPILED_MODEL_NAME, RBLNCompileConfig, RBLNConfig
 from ....utils.runtime_utils import RBLNPytorchRuntime
 from .generation_whisper import RBLNWhisperGenerationMixin

optimum/rbln/transformers/models/xlm_roberta/modeling_xlm_roberta.py

@@ -22,12 +22,12 @@
 # from Rebellions Inc.
 
 import logging
-from typing import TYPE_CHECKING, Any, Dict, Optional, Union
+from typing import TYPE_CHECKING, Optional, Union
 
 import torch
-from transformers import PretrainedConfig, PreTrainedModel, XLMRobertaConfig, XLMRobertaModel
+from transformers import PretrainedConfig
 
-from ....modeling_base import RBLNModel
+from ....modeling import RBLNModel
 from ....modeling_config import RBLNCompileConfig, RBLNConfig
 
 
@@ -38,38 +38,6 @@ if TYPE_CHECKING:
 
 
 class RBLNXLMRobertaModel(RBLNModel):
-    original_model_class = XLMRobertaModel
-    original_config_class = XLMRobertaConfig
-
-    @classmethod
-    def get_pytorch_model(
-        cls,
-        model_id: str,
-        use_auth_token: Optional[Union[bool, str]] = None,
-        revision: Optional[str] = None,
-        force_download: bool = False,
-        cache_dir: Optional[str] = None,
-        subfolder: str = "",
-        local_files_only: bool = False,
-        trust_remote_code: bool = False,
-        rbln_kwargs: Optional[Dict[str, Any]] = None,
-        **kwargs,
-    ) -> "PreTrainedModel":
-        model: "PreTrainedModel" = super().get_pytorch_model(
-            model_id=model_id,
-            use_auth_token=use_auth_token,
-            revision=revision,
-            force_download=force_download,
-            cache_dir=cache_dir,
-            subfolder=subfolder,
-            local_files_only=local_files_only,
-            trust_remote_code=trust_remote_code,
-            rbln_kwargs=rbln_kwargs,
-            library_name="transformers",
-        )
-
-        return model
-
     @classmethod
     def _get_rbln_config(
         cls,