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.

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

Automatic Model Parallelism Through FX #1933

Merged
Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
5e39787
WIP
zhenglongjiepheonix Jun 3, 2024
7a5d394
add dist ops
zhenglongjiepheonix Jun 11, 2024
7e15d26
Merge remote-tracking branch 'upstream/main' into longjie/add_automat…
zhenglongjiepheonix Jun 11, 2024
98e5846
add index propagation
zhenglongjiepheonix Jun 15, 2024
2036dbb
support tp for linears
zhenglongjiepheonix Jul 1, 2024
34fffe8
Merge remote-tracking branch 'upstream/main' into longjie/add_automat…
zhenglongjiepheonix Jul 1, 2024
0876f5d
add embedding & weight tie
zhenglongjiepheonix Jul 8, 2024
87e66fb
Merge remote-tracking branch 'upstream/main' into longjie/add_automat…
zhenglongjiepheonix Jul 8, 2024
ae6d9d2
address comments
zhenglongjiepheonix Jul 8, 2024
455c0c7
lint
zhenglongjiepheonix Jul 8, 2024
27a9bb8
fix
zhenglongjiepheonix Jul 12, 2024
473388b
Merge remote-tracking branch 'upstream/main' into longjie/add_automat…
zhenglongjiepheonix Jul 12, 2024
0512b23
fix
zhenglongjiepheonix Jul 12, 2024
8ec6727
debug
zhenglongjiepheonix Jul 13, 2024
5095f1e
fix
zhenglongjiepheonix Jul 13, 2024
f6ebfc0
fix tests
zhenglongjiepheonix Jul 15, 2024
e71e5ea
add experimental API
zhenglongjiepheonix Jul 16, 2024
eb2a7a6
Merge remote-tracking branch 'upstream/main' into longjie/add_automat…
zhenglongjiepheonix Jul 16, 2024
779c77d
nit
zhenglongjiepheonix Jul 16, 2024
e09df2a
fix api
zhenglongjiepheonix Jul 17, 2024
22fe1a3
Merge remote-tracking branch 'upstream/main' into longjie/add_automat…
zhenglongjiepheonix Jul 17, 2024
9fd29d1
fix api
zhenglongjiepheonix Jul 18, 2024
01cfc25
format
zhenglongjiepheonix Jul 18, 2024
8c16267
clean tests
zhenglongjiepheonix Jul 18, 2024
8ef00e0
fix weight_map
zhenglongjiepheonix Jul 18, 2024
6ef2081
add weights loading
zhenglongjiepheonix Jul 22, 2024
2c561d3
format
zhenglongjiepheonix Jul 22, 2024
fc96b6f
fix
zhenglongjiepheonix Jul 22, 2024
8d2cabb
fix
zhenglongjiepheonix Jul 23, 2024
c9c7571
Merge remote-tracking branch 'upstream/main' into longjie/add_automat…
zhenglongjiepheonix Jul 23, 2024
97e6431
enable tests
zhenglongjiepheonix Jul 23, 2024
efd5d28
address comments
zhenglongjiepheonix Jul 24, 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
65 changes: 65 additions & 0 deletions .github/workflows/test_fx_automatic_parallel.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
name: Automatic Model Parallelism Test on GPUs

on:
pull_request:
branches:
- main
paths:
- 'optimum/fx/parallelization/**.py'
push:
branches:
- main
paths:
- 'optimum/fx/parallelization/**.py'

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
run_gpu_tests:
strategy:
fail-fast: false
matrix:
config:
- name: GPU-enabled Optimum Test Suite
image: nvidia/cuda:12.4.1-devel-ubuntu22.04
gpu_target: ["nvidia-multi-gpu-l4-runners", "nvidia-multi-gpu-a10-runners"]

name: ${{ matrix.config.name }}
runs-on:
group: "${{matrix.gpu_target}}"

container:
image: ${{ matrix.config.image }}
options: --mount type=tmpfs,destination=/tmp --shm-size 64gb --gpus all --ipc host -v /mnt/hf_cache:/mnt/cache/
env:
NCCL_DEBUG: INFO
HF_TOKEN: ${{ secrets.HF_HUB_READ_TOKEN }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zhenglongjiepheonix @michaelbenayoun is HF_TOKEN used for the tests (can't see where) or can we remove ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's not used, you can remove it

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed in #2061

defaults:
run:
shell: bash

steps:
- uses: actions/setup-python@v5
with:
python-version: '3.10'

- name: Checkout optimum
uses: actions/checkout@v4
with:
fetch-depth: 1

- name: Run nvidia-smi
run: |
nvidia-smi

- name: Install dependencies
run: |
python3 -m pip install -U pip
python3 -m pip install torch transformers
python3 -m pip install .[tests]

- name: Run automatic model parallelism tests
run: |
pytest -s -v -o log_cli=true tests/fx/parallelization
16 changes: 16 additions & 0 deletions optimum/fx/parallelization/__init__.py
zhenglongjiepheonix marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# coding=utf-8
# Copyright 2024 The HuggingFace Team. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from .api import parallelize_backend, parallelize_model
from .core import Config, ParallelExecutionCtx
155 changes: 155 additions & 0 deletions optimum/fx/parallelization/api.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
# coding=utf-8
# Copyright 2024 The HuggingFace Team. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import glob
import importlib
import json
import os
from functools import partial
from typing import List, Optional, Union

import torch
from torch.fx import GraphModule

from .core import Config, ParallelExecutionCtx
from .passes import build_parallel_pass_pipeline
from .utils import (
MetaAwareMethodsPatcher,
convert_bin_to_safetensors,
download_files_from_hf,
initialize_parameter_meta,
move_model_to_device,
)


def parallelize_backend(
graph_module: GraphModule, example_inputs: List[torch.Tensor], ctx: ParallelExecutionCtx, config: Config
) -> GraphModule:
ctx.example_inputs = example_inputs
pass_pipeline = build_parallel_pass_pipeline()
graph_module = pass_pipeline(graph_module=graph_module, ctx=ctx, config=config)
ctx.compile_times += 1
ctx.last_optimized_graph_module = graph_module
return graph_module


def parallelize_model(
model: Union[torch.nn.Module, str],
parallel_ctx: ParallelExecutionCtx,
*model_args,
revision: str = "main",
cache_dir: Optional[str] = None,
local_files_only: bool = False,
skip_load_weights: bool = False,
**kwargs,
):
"""
API for automatic model parallelism through Pytorch FX.

Args:
model (Union[torch.nn.Module, str]):
Model to parallelize, could either be a module or a model id in huggingface space.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
model (Union[torch.nn.Module, str]):
Model to parallelize, could either be a module or a model id in huggingface space.
model (Union[torch.nn.Module, str]):
Model to parallelize, could either be a module or a model id on the Hugging Face Hub.

parallel_ctx (ParallelExecutionCtx):
Parallel execution context containing process groups the current process belongs to.
model_args (additional postional arguments, optional):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
model_args (additional postional arguments, optional):
*model_args (Any):

Should we add also model_kwargs?

Additional postional arguments for intializing the model if a model id is passed.
revision (`str`, defaults to `main`):
Model revision for weights downloading if a model id is passed.
cache_dir (`Optional[str]`, defaults to `None`):
Cache directory to store downloaded weights. Defaults to None.
local_files_only (`bool`, defaults to `False`):
Whether to use local files only, will avoid downloading from remote if set to `True`.
skip_load_weights (`bool`, defaults to `False`):
Whether to skip loading weights from disk to model.
kwargs (additional keyword arguments, optional):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
kwargs (additional keyword arguments, optional):
**kwargs (Dict[str, Any]):

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We provide a lot of things here.
IMO we should simplify that. Most of these arguments come from the from_pretrained method.
So I would gather them as one keyword argument: model_kwargs.

Addtional keyword arguments for overriding fields in parallel config, model config and `Model.__init__`.
"""
parallel_config = Config()
for k, v in kwargs.items():
if k in parallel_config.__dict__:
setattr(parallel_config, k, v)
kwargs = {k: v for k, v in kwargs.items() if k not in parallel_config.__dict__}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can also iterate on a copy of kwargs and pop elements as follows:

Suggested change
for k, v in kwargs.items():
if k in parallel_config.__dict__:
setattr(parallel_config, k, v)
kwargs = {k: v for k, v in kwargs.items() if k not in parallel_config.__dict__}
for k, v in dict(kwargs).items():
if k in parallel_config.__dict__:
setattr(parallel_config, k, v)
kwargs.pop(k)


if isinstance(model, str):
from transformers import AutoConfig
from transformers.utils import SAFE_WEIGHTS_INDEX_NAME, WEIGHTS_INDEX_NAME

is_local = os.path.isdir(model)
allow_patterns = ["*.safetensors", "*.bin"]
if not is_local:
hf_folder = download_files_from_hf(
model_name_or_path=model,
cache_dir=cache_dir,
allow_patterns=allow_patterns,
revision=revision,
local_files_only=local_files_only,
skip_download_weights=skip_load_weights,
)
else:
hf_folder = model

# should be able to load config using only local files
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No because you only allowed patterns to be safetensors and bin files, and config is a json.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here I move all the dowload logic including config and index files into download_model_from_hf

model_config, kwargs = AutoConfig.from_pretrained(
hf_folder, revision=revision, local_files_only=True, return_unused_kwargs=True, **kwargs
)

# try getting model class info from config
model_arch = model_config.architectures
model_cls = getattr(importlib.import_module("transformers"), model_arch[0])

if not skip_load_weights:
use_safetensors = False
for pattern in allow_patterns:
if len(glob.glob(os.path.join(hf_folder, pattern))) > 0:
use_safetensors = pattern == "*.safetensors"
break
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can be simplified.

index_path = os.path.join(hf_folder, SAFE_WEIGHTS_INDEX_NAME if use_safetensors else WEIGHTS_INDEX_NAME)
if os.path.isfile(index_path):
with open(index_path) as f:
index_dict = json.load(f)
parallel_ctx.weight_map = {k: os.path.join(hf_folder, v) for k, v in index_dict["weight_map"].items()}
weight_files = glob.glob(os.path.join(hf_folder, "*.safetensors" if use_safetensors else "*.bin"))
if not use_safetensors:
weight_map = parallel_ctx.weight_map if parallel_ctx.weight_map else {}
convert_bin_to_safetensors(model, cache_dir, weight_files, weight_map)
parallel_ctx.weight_map = weight_map

# try directly construct weight_map from weight files, should have safetensors file on disk in any case
if not parallel_ctx.weight_map:
from safetensors import safe_open

weight_map, weight_files = {}, glob.glob(os.path.join(hf_folder, "*.safetensors"))
for weight_file in weight_files:
with safe_open(filename=weight_file, framework="pt") as f:
for key in f.keys():
weight_map[key] = weight_file
parallel_ctx.weight_map = weight_map
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: I think overall it can be simplified.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I move the logic into utils so it looks cleaner in api, but the logic itself is indeed complex, because we need to take care of situations where a local directory is passed, then the only thing we can do is to try to peek inside the folder and see if there are safetensors/bin files, and if there are only bin files, we need to convert them into safetensors, and if there is an index file, we load the weight_map directly from it, otherwise we try scanning all the weight files in the folder and assemble a weight_map out of them.


torch_dtype, dtype_orig = kwargs.pop("torch_dtype", None), None
if torch_dtype is not None:
dtype_orig = model_cls._set_default_torch_dtype(torch_dtype)

with MetaAwareMethodsPatcher():
model = model_cls(model_config, *model_args, **kwargs)
# TODO: remove this once support training-time trace
model.eval()

if dtype_orig is not None:
torch.set_default_dtype(dtype_orig)

move_model_to_device(model, device=parallel_ctx.current_device)
initialize_parameter_meta(model)
backend = partial(parallelize_backend, ctx=parallel_ctx, config=parallel_config)
model = torch.compile(model, fullgraph=True, backend=backend)
return model
Loading
Loading