Skip to content

Handle missing optional configuration fields correctly #24

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

Merged
tjruwase merged 3 commits into from
Feb 6, 2020
Merged

Handle missing optional configuration fields correctly #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43adb8a
Handle missing optional configuration fields correctly
tjruwase Feb 5, 2020
c50a553
Merge branch 'master' into olruwase/optional_optimizer
Feb 5, 2020
8c0a4ee
Merge branch 'master' into olruwase/optional_optimizer
jeffra Feb 6, 2020
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
3 changes: 2 additions & 1 deletion deepspeed/pt/deepspeed_config.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,8 @@ def _initialize_params(self, param_dict):
self.dynamic_loss_scale_args = get_dynamic_loss_scale_args(param_dict)

self.optimizer_name = get_optimizer_name(param_dict)
if self.optimizer_name.lower() in DEEPSPEED_OPTIMIZERS:
if self.optimizer_name is not None and \
self.optimizer_name.lower() in DEEPSPEED_OPTIMIZERS:
self.optimizer_name = self.optimizer_name.lower()

self.optimizer_params = get_optimizer_params(param_dict)
Expand Down
19 changes: 19 additions & 0 deletions tests/unit/test_ds_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import pytest
import os
import json
from deepspeed.pt import deepspeed_config as ds_config


def test_only_required_fields(tmpdir):
'''Ensure that config containing only the required fields is accepted. '''
cfg_json = tmpdir.mkdir('ds_config_unit_test').join('minimal.json')

with open(cfg_json, 'w') as f:
required_fields = {'train_batch_size': 64}
json.dump(required_fields, f)

run_cfg = ds_config.DeepSpeedConfig(cfg_json)
assert run_cfg is not None
assert run_cfg.train_batch_size == 64
assert run_cfg.train_micro_batch_size_per_gpu == 64
assert run_cfg.gradient_accumulation_steps == 1