Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
DeepSpeed
提交
4079077c
D
DeepSpeed
项目概览
Greenplum
/
DeepSpeed
上一次同步 大约 1 年
通知
10
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
DeepSpeed
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
4079077c
编写于
2月 03, 2023
作者:
M
Michael Wyatt
提交者:
GitHub
2月 03, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add support for hjson config files (#2783)
Co-authored-by:
N
Olatunji Ruwase
<
olruwase@microsoft.com
>
上级
2c6e8194
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
36 addition
and
3 deletion
+36
-3
deepspeed/runtime/config.py
deepspeed/runtime/config.py
+3
-2
tests/unit/runtime/test_ds_config_dict.py
tests/unit/runtime/test_ds_config_dict.py
+33
-1
未找到文件。
deepspeed/runtime/config.py
浏览文件 @
4079077c
...
@@ -7,6 +7,7 @@ from typing import Union
...
@@ -7,6 +7,7 @@ from typing import Union
import
torch
import
torch
import
json
import
json
import
hjson
import
copy
import
copy
import
base64
import
base64
...
@@ -705,14 +706,14 @@ class DeepSpeedConfig(object):
...
@@ -705,14 +706,14 @@ class DeepSpeedConfig(object):
if
isinstance
(
config
,
dict
):
if
isinstance
(
config
,
dict
):
self
.
_param_dict
=
config
self
.
_param_dict
=
config
elif
os
.
path
.
exists
(
config
):
elif
os
.
path
.
exists
(
config
):
self
.
_param_dict
=
json
.
load
(
self
.
_param_dict
=
h
json
.
load
(
open
(
config
,
open
(
config
,
"r"
),
"r"
),
object_pairs_hook
=
dict_raise_error_on_duplicate_keys
)
object_pairs_hook
=
dict_raise_error_on_duplicate_keys
)
else
:
else
:
try
:
try
:
config_decoded
=
base64
.
urlsafe_b64decode
(
config
).
decode
(
'utf-8'
)
config_decoded
=
base64
.
urlsafe_b64decode
(
config
).
decode
(
'utf-8'
)
self
.
_param_dict
=
json
.
loads
(
config_decoded
)
self
.
_param_dict
=
h
json
.
loads
(
config_decoded
)
except
(
UnicodeDecodeError
,
AttributeError
):
except
(
UnicodeDecodeError
,
AttributeError
):
raise
ValueError
(
raise
ValueError
(
f
"Expected a string path to an existing deepspeed config, or a dictionary or a valid base64. Received:
{
config
}
"
f
"Expected a string path to an existing deepspeed config, or a dictionary or a valid base64. Received:
{
config
}
"
...
...
tests/unit/runtime/test_ds_config_dict.py
浏览文件 @
4079077c
# A test on its own
# A test on its own
import
os
import
torch
import
torch
import
pytest
import
pytest
import
json
import
json
import
hjson
import
argparse
import
argparse
from
deepspeed.runtime.zero.config
import
DeepSpeedZeroConfig
from
deepspeed.runtime.zero.config
import
DeepSpeedZeroConfig
...
@@ -158,11 +160,41 @@ def test_get_bfloat16_enabled(bf16_key):
...
@@ -158,11 +160,41 @@ def test_get_bfloat16_enabled(bf16_key):
assert
get_bfloat16_enabled
(
cfg
)
==
True
assert
get_bfloat16_enabled
(
cfg
)
==
True
class
TestConfigLoad
(
DistributedTest
):
world_size
=
1
def
test_dict
(
self
,
base_config
):
hidden_dim
=
10
model
=
SimpleModel
(
hidden_dim
)
model
,
_
,
_
,
_
=
deepspeed
.
initialize
(
config
=
base_config
,
model
=
model
,
model_parameters
=
model
.
parameters
())
def
test_json
(
self
,
base_config
,
tmpdir
):
config_path
=
os
.
path
.
join
(
tmpdir
,
"config.json"
)
with
open
(
config_path
,
'w'
)
as
fp
:
json
.
dump
(
base_config
,
fp
)
hidden_dim
=
10
model
=
SimpleModel
(
hidden_dim
)
model
,
_
,
_
,
_
=
deepspeed
.
initialize
(
config
=
config_path
,
model
=
model
,
model_parameters
=
model
.
parameters
())
def
test_hjson
(
self
,
base_config
,
tmpdir
):
config_path
=
os
.
path
.
join
(
tmpdir
,
"config.json"
)
with
open
(
config_path
,
'w'
)
as
fp
:
hjson
.
dump
(
base_config
,
fp
)
hidden_dim
=
10
model
=
SimpleModel
(
hidden_dim
)
model
,
_
,
_
,
_
=
deepspeed
.
initialize
(
config
=
config_path
,
model
=
model
,
model_parameters
=
model
.
parameters
())
class
TestDeprecatedDeepScaleConfig
(
DistributedTest
):
class
TestDeprecatedDeepScaleConfig
(
DistributedTest
):
world_size
=
1
world_size
=
1
def
test
(
self
,
base_config
,
tmpdir
):
def
test
(
self
,
base_config
,
tmpdir
):
config_path
=
create_config_from_dict
(
tmpdir
,
base_config
)
config_path
=
create_config_from_dict
(
tmpdir
,
base_config
)
parser
=
argparse
.
ArgumentParser
()
parser
=
argparse
.
ArgumentParser
()
args
=
parser
.
parse_args
(
args
=
''
)
args
=
parser
.
parse_args
(
args
=
''
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录