Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modularize backbone class and block creation #1229

Merged
merged 4 commits into from
May 23, 2024
Merged

Modularize backbone class and block creation #1229

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
52db9e1
properties
dakinggg May 22, 2024
4e671b2
more refac
dakinggg May 22, 2024
b68be0c
Merge branch 'main' into model-refac
dakinggg May 22, 2024
967e3cf
Merge branch 'main' into model-refac
mvpatel2000 May 22, 2024
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
33 changes: 24 additions & 9 deletions llmfoundry/models/mpt/modeling_mpt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,14 +369,7 @@ def __init__(self, config: MPTConfig):
self.mb_args = None
self.shift_labels = True

block_args = self.extract_block_args(config.to_dict())

self.blocks = nn.ModuleList([
MPTBlock(
device=config.init_device,
**block_args,
) for _ in range(config.n_layers)
])
self.blocks = self.construct_blocks(config=config,)

# Tag all modules in the transformer blocks with the corresponding block_idx and max_block_idx
for i, block in enumerate(self.blocks):
Expand Down Expand Up @@ -438,6 +431,24 @@ def __init__(self, config: MPTConfig):
log.debug(self)
log.debug(f'Using {self.config.init_config["name"]} initialization.')

def construct_blocks(self, config: MPTConfig) -> nn.ModuleList:
"""Construct the nn.ModuleList with the Transformer blocks.

Args:
config (MPTConfig): The configuration object.

Returns:
nn.ModuleList: The list of Transformer blocks.
"""
block_args = self.extract_block_args(config.to_dict())

return nn.ModuleList([
MPTBlock(
device=config.init_device,
**block_args,
) for _ in range(config.n_layers)
])

def extract_block_args(self, block_args: Dict[str, Any]) -> Dict[str, Any]:
"""Sets the block args."""
if block_args['ffn_config']['ffn_type'] in ffns_with_megablocks:
Expand Down Expand Up @@ -788,7 +799,7 @@ def __init__(self, config: MPTConfig):
super().__init__(config)
log.info(f'Instantiating an MPTForCausalLM model from {__file__}')

self.transformer: MPTModel = MPTModel(config)
self.transformer: MPTModel = self.backbone_model_class(config)

self.lm_head = None
if not config.tie_word_embeddings:
Expand Down Expand Up @@ -820,6 +831,10 @@ def __init__(self, config: MPTConfig):
)
self.logit_scale = logit_scale

@property
def backbone_model_class(self) -> Type[MPTModel]:
return MPTModel

def get_input_embeddings(self) -> Union[SharedEmbedding, nn.Embedding]:
return self.transformer.get_input_embeddings()

Expand Down
Loading