Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
ColossalAI
Commits
ac178ca5
Commit
ac178ca5
authored
Sep 04, 2023
by
Hongxin Liu
Browse files
[legacy] move builder and registry to legacy (#4603)
parent
8accecd5
Changes
65
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
25 additions
and
20 deletions
+25
-20
colossalai/auto_parallel/tensor_shard/node_handler/registry.py
...salai/auto_parallel/tensor_shard/node_handler/registry.py
+1
-1
colossalai/context/parallel_context.py
colossalai/context/parallel_context.py
+1
-1
colossalai/context/process_group_initializer/initializer_1d.py
...salai/context/process_group_initializer/initializer_1d.py
+2
-1
colossalai/context/process_group_initializer/initializer_2d.py
...salai/context/process_group_initializer/initializer_2d.py
+1
-1
colossalai/context/process_group_initializer/initializer_2p5d.py
...lai/context/process_group_initializer/initializer_2p5d.py
+2
-1
colossalai/context/process_group_initializer/initializer_3d.py
...salai/context/process_group_initializer/initializer_3d.py
+1
-1
colossalai/context/process_group_initializer/initializer_data.py
...lai/context/process_group_initializer/initializer_data.py
+1
-1
colossalai/context/process_group_initializer/initializer_model.py
...ai/context/process_group_initializer/initializer_model.py
+4
-2
colossalai/context/process_group_initializer/initializer_pipeline.py
...context/process_group_initializer/initializer_pipeline.py
+1
-1
colossalai/context/process_group_initializer/initializer_sequence.py
...context/process_group_initializer/initializer_sequence.py
+1
-1
colossalai/context/process_group_initializer/initializer_tensor.py
...i/context/process_group_initializer/initializer_tensor.py
+3
-2
colossalai/initialize.py
colossalai/initialize.py
+1
-1
colossalai/legacy/builder/__init__.py
colossalai/legacy/builder/__init__.py
+0
-0
colossalai/legacy/builder/builder.py
colossalai/legacy/builder/builder.py
+1
-1
colossalai/legacy/engine/gradient_handler/_data_parallel_gradient_handler.py
...ngine/gradient_handler/_data_parallel_gradient_handler.py
+1
-1
colossalai/legacy/engine/gradient_handler/_moe_gradient_handler.py
...i/legacy/engine/gradient_handler/_moe_gradient_handler.py
+1
-1
colossalai/legacy/engine/gradient_handler/_pipeline_parallel_gradient_handler.py
...e/gradient_handler/_pipeline_parallel_gradient_handler.py
+1
-1
colossalai/legacy/engine/gradient_handler/_sequence_parallel_gradient_handler.py
...e/gradient_handler/_sequence_parallel_gradient_handler.py
+1
-1
colossalai/legacy/engine/gradient_handler/_zero_gradient_handler.py
.../legacy/engine/gradient_handler/_zero_gradient_handler.py
+1
-1
colossalai/legacy/registry/__init__.py
colossalai/legacy/registry/__init__.py
+0
-0
No files found.
colossalai/auto_parallel/tensor_shard/node_handler/registry.py
View file @
ac178ca5
class
Registry
:
class
Registry
:
# TODO: refactor the registry classes used in colossalai.registry, colossalai.fx and here
# TODO: refactor the registry classes used in colossalai.
legacy.
registry, colossalai.fx and here
def
__init__
(
self
,
name
):
def
__init__
(
self
,
name
):
self
.
name
=
name
self
.
name
=
name
...
...
colossalai/context/parallel_context.py
View file @
ac178ca5
...
@@ -15,8 +15,8 @@ from colossalai.constants import ALLOWED_MODES, INITIALIZER_MAPPING
...
@@ -15,8 +15,8 @@ from colossalai.constants import ALLOWED_MODES, INITIALIZER_MAPPING
from
colossalai.context.config
import
Config
from
colossalai.context.config
import
Config
from
colossalai.context.singleton_meta
import
SingletonMeta
from
colossalai.context.singleton_meta
import
SingletonMeta
from
colossalai.global_variables
import
tensor_parallel_env
as
env
from
colossalai.global_variables
import
tensor_parallel_env
as
env
from
colossalai.legacy.registry
import
DIST_GROUP_INITIALIZER
from
colossalai.logging
import
get_dist_logger
from
colossalai.logging
import
get_dist_logger
from
colossalai.registry
import
DIST_GROUP_INITIALIZER
from
.parallel_mode
import
ParallelMode
from
.parallel_mode
import
ParallelMode
from
.random
import
add_seed
,
get_seeds
,
set_mode
from
.random
import
add_seed
,
get_seeds
,
set_mode
...
...
colossalai/context/process_group_initializer/initializer_1d.py
View file @
ac178ca5
...
@@ -2,8 +2,9 @@
...
@@ -2,8 +2,9 @@
# -*- encoding: utf-8 -*-
# -*- encoding: utf-8 -*-
import
torch.distributed
as
dist
import
torch.distributed
as
dist
from
colossalai.global_variables
import
tensor_parallel_env
as
env
from
colossalai.global_variables
import
tensor_parallel_env
as
env
from
colossalai.registry
import
DIST_GROUP_INITIALIZER
from
colossalai.
legacy.
registry
import
DIST_GROUP_INITIALIZER
from
..parallel_mode
import
ParallelMode
from
..parallel_mode
import
ParallelMode
from
.process_group_initializer
import
ProcessGroupInitializer
from
.process_group_initializer
import
ProcessGroupInitializer
...
...
colossalai/context/process_group_initializer/initializer_2d.py
View file @
ac178ca5
...
@@ -3,7 +3,7 @@ import math
...
@@ -3,7 +3,7 @@ import math
import
torch.distributed
as
dist
import
torch.distributed
as
dist
from
colossalai.global_variables
import
tensor_parallel_env
as
env
from
colossalai.global_variables
import
tensor_parallel_env
as
env
from
colossalai.registry
import
DIST_GROUP_INITIALIZER
from
colossalai.
legacy.
registry
import
DIST_GROUP_INITIALIZER
from
..parallel_mode
import
ParallelMode
from
..parallel_mode
import
ParallelMode
from
.process_group_initializer
import
ProcessGroupInitializer
from
.process_group_initializer
import
ProcessGroupInitializer
...
...
colossalai/context/process_group_initializer/initializer_2p5d.py
View file @
ac178ca5
...
@@ -4,9 +4,10 @@
...
@@ -4,9 +4,10 @@
import
math
import
math
import
torch.distributed
as
dist
import
torch.distributed
as
dist
from
colossalai.context
import
Config
from
colossalai.context
import
Config
from
colossalai.global_variables
import
tensor_parallel_env
as
env
from
colossalai.global_variables
import
tensor_parallel_env
as
env
from
colossalai.registry
import
DIST_GROUP_INITIALIZER
from
colossalai.
legacy.
registry
import
DIST_GROUP_INITIALIZER
from
..parallel_mode
import
ParallelMode
from
..parallel_mode
import
ParallelMode
from
.process_group_initializer
import
ProcessGroupInitializer
from
.process_group_initializer
import
ProcessGroupInitializer
...
...
colossalai/context/process_group_initializer/initializer_3d.py
View file @
ac178ca5
...
@@ -6,7 +6,7 @@ import math
...
@@ -6,7 +6,7 @@ import math
import
torch.distributed
as
dist
import
torch.distributed
as
dist
from
colossalai.global_variables
import
tensor_parallel_env
as
env
from
colossalai.global_variables
import
tensor_parallel_env
as
env
from
colossalai.registry
import
DIST_GROUP_INITIALIZER
from
colossalai.
legacy.
registry
import
DIST_GROUP_INITIALIZER
from
..parallel_mode
import
ParallelMode
from
..parallel_mode
import
ParallelMode
from
.process_group_initializer
import
ProcessGroupInitializer
from
.process_group_initializer
import
ProcessGroupInitializer
...
...
colossalai/context/process_group_initializer/initializer_data.py
View file @
ac178ca5
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
from
torch
import
distributed
as
dist
from
torch
import
distributed
as
dist
from
colossalai.registry
import
DIST_GROUP_INITIALIZER
from
colossalai.
legacy.
registry
import
DIST_GROUP_INITIALIZER
from
..parallel_mode
import
ParallelMode
from
..parallel_mode
import
ParallelMode
from
.process_group_initializer
import
ProcessGroupInitializer
from
.process_group_initializer
import
ProcessGroupInitializer
...
...
colossalai/context/process_group_initializer/initializer_model.py
View file @
ac178ca5
...
@@ -2,9 +2,11 @@
...
@@ -2,9 +2,11 @@
# -*- encoding: utf-8 -*-
# -*- encoding: utf-8 -*-
import
torch.distributed
as
dist
import
torch.distributed
as
dist
from
colossalai.registry
import
DIST_GROUP_INITIALIZER
from
.process_group_initializer
import
ProcessGroupInitializer
from
colossalai.legacy.registry
import
DIST_GROUP_INITIALIZER
from
..parallel_mode
import
ParallelMode
from
..parallel_mode
import
ParallelMode
from
.process_group_initializer
import
ProcessGroupInitializer
@
DIST_GROUP_INITIALIZER
.
register_module
@
DIST_GROUP_INITIALIZER
.
register_module
...
...
colossalai/context/process_group_initializer/initializer_pipeline.py
View file @
ac178ca5
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
from
torch
import
distributed
as
dist
from
torch
import
distributed
as
dist
from
colossalai.registry
import
DIST_GROUP_INITIALIZER
from
colossalai.
legacy.
registry
import
DIST_GROUP_INITIALIZER
from
..parallel_mode
import
ParallelMode
from
..parallel_mode
import
ParallelMode
from
.process_group_initializer
import
ProcessGroupInitializer
from
.process_group_initializer
import
ProcessGroupInitializer
...
...
colossalai/context/process_group_initializer/initializer_sequence.py
View file @
ac178ca5
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
# -*- encoding: utf-8 -*-
# -*- encoding: utf-8 -*-
import
torch.distributed
as
dist
import
torch.distributed
as
dist
from
colossalai.registry
import
DIST_GROUP_INITIALIZER
from
colossalai.
legacy.
registry
import
DIST_GROUP_INITIALIZER
from
..parallel_mode
import
ParallelMode
from
..parallel_mode
import
ParallelMode
from
.initializer_tensor
import
Initializer_Tensor
from
.initializer_tensor
import
Initializer_Tensor
...
...
colossalai/context/process_group_initializer/initializer_tensor.py
View file @
ac178ca5
...
@@ -3,9 +3,10 @@
...
@@ -3,9 +3,10 @@
import
torch.distributed
as
dist
import
torch.distributed
as
dist
from
colossalai.registry
import
DIST_GROUP_INITIALIZER
from
colossalai.
legacy.
registry
import
DIST_GROUP_INITIALIZER
from
.process_group_initializer
import
ProcessGroupInitializer
from
..parallel_mode
import
ParallelMode
from
..parallel_mode
import
ParallelMode
from
.process_group_initializer
import
ProcessGroupInitializer
@
DIST_GROUP_INITIALIZER
.
register_module
@
DIST_GROUP_INITIALIZER
.
register_module
...
...
colossalai/initialize.py
View file @
ac178ca5
...
@@ -17,10 +17,10 @@ from torch.utils.data import DataLoader
...
@@ -17,10 +17,10 @@ from torch.utils.data import DataLoader
from
colossalai.amp
import
AMP_TYPE
,
convert_to_amp
from
colossalai.amp
import
AMP_TYPE
,
convert_to_amp
from
colossalai.amp.naive_amp
import
NaiveAMPModel
from
colossalai.amp.naive_amp
import
NaiveAMPModel
from
colossalai.builder.builder
import
build_gradient_handler
from
colossalai.context
import
Config
,
ConfigException
,
ParallelMode
from
colossalai.context
import
Config
,
ConfigException
,
ParallelMode
from
colossalai.context.moe_context
import
MOE_CONTEXT
from
colossalai.context.moe_context
import
MOE_CONTEXT
from
colossalai.core
import
global_context
as
gpc
from
colossalai.core
import
global_context
as
gpc
from
colossalai.legacy.builder.builder
import
build_gradient_handler
from
colossalai.legacy.engine
import
Engine
from
colossalai.legacy.engine
import
Engine
from
colossalai.legacy.engine.gradient_accumulation
import
accumulate_gradient
from
colossalai.legacy.engine.gradient_accumulation
import
accumulate_gradient
from
colossalai.legacy.engine.schedule
import
(
from
colossalai.legacy.engine.schedule
import
(
...
...
colossalai/builder/__init__.py
→
colossalai/
legacy/
builder/__init__.py
View file @
ac178ca5
File moved
colossalai/builder/builder.py
→
colossalai/
legacy/
builder/builder.py
View file @
ac178ca5
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
import
inspect
import
inspect
from
colossalai.registry
import
*
from
colossalai.
legacy.
registry
import
*
def
build_from_config
(
module
,
config
:
dict
):
def
build_from_config
(
module
,
config
:
dict
):
...
...
colossalai/legacy/engine/gradient_handler/_data_parallel_gradient_handler.py
View file @
ac178ca5
from
colossalai.context.parallel_mode
import
ParallelMode
from
colossalai.context.parallel_mode
import
ParallelMode
from
colossalai.core
import
global_context
as
gpc
from
colossalai.core
import
global_context
as
gpc
from
colossalai.registry
import
GRADIENT_HANDLER
from
colossalai.
legacy.
registry
import
GRADIENT_HANDLER
from
._base_gradient_handler
import
BaseGradientHandler
from
._base_gradient_handler
import
BaseGradientHandler
from
.utils
import
bucket_allreduce
from
.utils
import
bucket_allreduce
...
...
colossalai/legacy/engine/gradient_handler/_moe_gradient_handler.py
View file @
ac178ca5
from
colossalai.context.moe_context
import
MOE_CONTEXT
from
colossalai.context.moe_context
import
MOE_CONTEXT
from
colossalai.context.parallel_mode
import
ParallelMode
from
colossalai.context.parallel_mode
import
ParallelMode
from
colossalai.core
import
global_context
as
gpc
from
colossalai.core
import
global_context
as
gpc
from
colossalai.registry
import
GRADIENT_HANDLER
from
colossalai.
legacy.
registry
import
GRADIENT_HANDLER
from
colossalai.utils.moe
import
get_moe_epsize_param_dict
from
colossalai.utils.moe
import
get_moe_epsize_param_dict
from
._base_gradient_handler
import
BaseGradientHandler
from
._base_gradient_handler
import
BaseGradientHandler
...
...
colossalai/legacy/engine/gradient_handler/_pipeline_parallel_gradient_handler.py
View file @
ac178ca5
...
@@ -7,7 +7,7 @@ import torch.distributed as dist
...
@@ -7,7 +7,7 @@ import torch.distributed as dist
from
torch._utils
import
_flatten_dense_tensors
,
_unflatten_dense_tensors
from
torch._utils
import
_flatten_dense_tensors
,
_unflatten_dense_tensors
from
colossalai.core
import
global_context
as
gpc
from
colossalai.core
import
global_context
as
gpc
from
colossalai.registry
import
GRADIENT_HANDLER
from
colossalai.
legacy.
registry
import
GRADIENT_HANDLER
from
._base_gradient_handler
import
BaseGradientHandler
from
._base_gradient_handler
import
BaseGradientHandler
...
...
colossalai/legacy/engine/gradient_handler/_sequence_parallel_gradient_handler.py
View file @
ac178ca5
from
colossalai.context.parallel_mode
import
ParallelMode
from
colossalai.context.parallel_mode
import
ParallelMode
from
colossalai.core
import
global_context
as
gpc
from
colossalai.core
import
global_context
as
gpc
from
colossalai.registry
import
GRADIENT_HANDLER
from
colossalai.
legacy.
registry
import
GRADIENT_HANDLER
from
._base_gradient_handler
import
BaseGradientHandler
from
._base_gradient_handler
import
BaseGradientHandler
from
.utils
import
bucket_allreduce
from
.utils
import
bucket_allreduce
...
...
colossalai/legacy/engine/gradient_handler/_zero_gradient_handler.py
View file @
ac178ca5
from
colossalai.registry
import
GRADIENT_HANDLER
from
colossalai.
legacy.
registry
import
GRADIENT_HANDLER
from
._base_gradient_handler
import
BaseGradientHandler
from
._base_gradient_handler
import
BaseGradientHandler
...
...
colossalai/registry/__init__.py
→
colossalai/
legacy/
registry/__init__.py
View file @
ac178ca5
File moved
Prev
1
2
3
4
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment