Skip to content

Commit

Permalink
Update Dataset Raise Information (PaddlePaddle#808)
Browse files Browse the repository at this point in the history
  • Loading branch information
wuyefeilin authored Jan 28, 2021
1 parent a4f7645 commit d621dd4
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
6 changes: 3 additions & 3 deletions paddleseg/cvlibs/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ def optimizer(self) -> paddle.optimizer.Optimizer:
lr = self.learning_rate
args = self.optimizer_args
optimizer_type = args.pop('type')

if optimizer_type == 'sgd':
return paddle.optimizer.Momentum(
lr, parameters=self.model.parameters(), **args)
Expand Down Expand Up @@ -235,14 +235,14 @@ def model(self) -> paddle.nn.Layer:

@property
def train_dataset(self) -> paddle.io.Dataset:
_train_dataset = self.dic.get('train_dataset').copy()
_train_dataset = self.dic.get('train_dataset', {}).copy()
if not _train_dataset:
return None
return self._load_object(_train_dataset)

@property
def val_dataset(self) -> paddle.io.Dataset:
_val_dataset = self.dic.get('val_dataset').copy()
_val_dataset = self.dic.get('val_dataset', {}).copy()
if not _val_dataset:
return None
return self._load_object(_val_dataset)
Expand Down
6 changes: 5 additions & 1 deletion train.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,13 @@ def main(args):
batch_size=args.batch_size)

train_dataset = cfg.train_dataset
if not train_dataset:
if train_dataset is None:
raise RuntimeError(
'The training dataset is not specified in the configuration file.')
elif len(train_dataset) == 0:
raise ValueError(
'The length of train_dataset is 0. Please check if your dataset is valid'
)
val_dataset = cfg.val_dataset if args.do_eval else None
losses = cfg.loss

Expand Down
6 changes: 5 additions & 1 deletion val.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,14 @@ def main(args):

cfg = Config(args.cfg)
val_dataset = cfg.val_dataset
if not val_dataset:
if val_dataset is None:
raise RuntimeError(
'The verification dataset is not specified in the configuration file.'
)
elif len(val_dataset) == 0:
raise ValueError(
'The length of val_dataset is 0. Please check if your dataset is valid'
)

msg = '\n---------------Config Information---------------\n'
msg += str(cfg)
Expand Down

0 comments on commit d621dd4

Please sign in to comment.