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

Jump to bottom

Fix/fix testcase #5770

Merged
merged 5 commits into from
Jun 3, 2024
Merged

Fix/fix testcase #5770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
42d7b29
[fix] branch for fix testcase;
duanjunwen Jun 3, 2024
43b94bb
Merge branch 'main' of https://github.com/hpcaitech/ColossalAI into f…
duanjunwen Jun 3, 2024
54ba7a9
[fix] fix test_analyzer & test_auto_parallel;
duanjunwen Jun 3, 2024
f040052
[fix] remove local change about moe;
duanjunwen Jun 3, 2024
23f2674
[fix] rm local change moe;
duanjunwen Jun 3, 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
2 changes: 1 addition & 1 deletion colossalai/_analyzer/fx/codegen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,4 +469,4 @@ def emit_node(node: Node, body):
{wrap_stmts}
{prologue}
{code}"""
return PythonCode(fn_code, globals_)
return PythonCode(fn_code, globals_, {})
2 changes: 1 addition & 1 deletion colossalai/fx/codegen/activation_checkpoint_codegen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,7 +859,7 @@ def emit_node(node: Node, body):
{wrap_stmts}
{prologue}
{code}"""
return PythonCode(fn_code, globals_)
return PythonCode(fn_code, globals_, {})

else:

Expand Down
6 changes: 3 additions & 3 deletions tests/test_auto_parallel/test_offload/model_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import torch.nn as nn
from transformers import BertConfig, BertLMHeadModel, GPT2Config, GPT2LMHeadModel

from tests.components_to_test.registry import non_distributed_component_funcs
# from tests.components_to_test.registry import non_distributed_component_funcs


class GPTLMModel(nn.Module):
Expand Down Expand Up @@ -55,7 +55,7 @@ def forward(self, input_ids, attention_mask):
return self.model(input_ids=input_ids, attention_mask=attention_mask, use_cache=True)[0]


@non_distributed_component_funcs.register(name="bert_")
# @non_distributed_component_funcs.register(name="bert_")
def get_bert_components():
vocab_size = 1024
seq_len = 64
Expand All @@ -74,7 +74,7 @@ def bert_data_gen(device="meta"):
return bert_model_builder, bert_data_gen


@non_distributed_component_funcs.register(name="gpt2_")
# @non_distributed_component_funcs.register(name="gpt2_")
def get_gpt2_components():
vocab_size = 1024
seq_len = 8
Expand Down
7 changes: 5 additions & 2 deletions tests/test_auto_parallel/test_offload/test_perf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@
from colossalai.auto_parallel.offload.mem_optimize import memory_optimize
from colossalai.auto_parallel.offload.solver import NOT_NVML
from colossalai.fx.profiler import parameter_size
from colossalai.legacy.zero.gemini.colo_init_context import ColoInitContext
from colossalai.nn.optimizer import HybridAdam
from colossalai.testing import parameterize, rerun_if_address_is_in_use, spawn
from colossalai.zero import ColoInitContext, zero_model_wrapper, zero_optim_wrapper
from colossalai.utils import set_seed
from colossalai.zero import zero_model_wrapper, zero_optim_wrapper
from tests.test_auto_parallel.test_offload.model_utils import *
from tests.test_tensor.common_utils import set_seed

# from tests.test_tensor.common_utils import set_seed


@parameterize("model_name", ["gpt2_"])
Expand Down
Loading