Skip to content

separation parameter #3831

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

separation parameter #3831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions paddleseg/core/export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ def export(args, model=None, save_dir=None, use_ema=False):
input_spec = [paddle.static.InputSpec(shape=shape, dtype='float32')]
model.eval()
model = paddle.jit.to_static(model, input_spec=input_spec)
uniform_output_enabled = cfg.dic.get('uniform_output_enabled', False)
if args.for_fd or uniform_output_enabled:
export_during_train = cfg.dic.get('export_during_train', False)
if args.for_fd or export_during_train:
save_name = 'inference'
yaml_name = 'inference.yml'
else:
save_name = 'model'
yaml_name = 'deploy.yaml'

if uniform_output_enabled:
if export_during_train:
inference_model_path = os.path.join(save_dir, "inference", save_name)
yml_file = os.path.join(save_dir, "inference", yaml_name)
if use_ema:
Expand Down
16 changes: 12 additions & 4 deletions paddleseg/core/train.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

import os
import gc
import time
import yaml
import json
Expand Down Expand Up @@ -124,6 +125,7 @@ def train(model,
param.stop_gradient = True

uniform_output_enabled = kwargs.pop("uniform_output_enabled", False)
export_during_train = kwargs.pop("export_during_train", False)
cli_args = kwargs.pop("cli_args", None)
model.train()
nranks = paddle.distributed.ParallelEnv().nranks
Expand Down Expand Up @@ -365,15 +367,17 @@ def train(model,
os.path.join(current_save_dir, 'model.pdparams'))
paddle.save(optimizer.state_dict(),
os.path.join(current_save_dir, 'model.pdopt'))
if uniform_output_enabled:
if export_during_train:
export(cli_args, model, current_save_dir)
gc.collect()

if use_ema:
paddle.save(
ema_model.state_dict(),
os.path.join(current_save_dir, 'ema_model.pdparams'))
if uniform_output_enabled:
if export_during_train:
export(cli_args, ema_model, current_save_dir, use_ema)
gc.collect()

save_models.append(current_save_dir)
if len(save_models) > keep_checkpoint_max > 0:
Expand Down Expand Up @@ -403,8 +407,10 @@ def train(model,
paddle.save(
states_dict,
os.path.join(best_model_dir, 'model.pdstates'))
if uniform_output_enabled:
if export_during_train:
export(cli_args, model, best_model_dir)
gc.collect()
if uniform_output_enabled:
save_model_info(states_dict, best_model_dir)
update_train_results(cli_args,
"best_model",
Expand Down Expand Up @@ -447,9 +453,11 @@ def train(model,
ema_states_dict,
os.path.join(best_ema_model_dir,
'ema_model.pdstates'))
if uniform_output_enabled:
if export_during_train:
export(cli_args, ema_model, best_ema_model_dir,
use_ema)
gc.collect()
if uniform_output_enabled:
save_model_info(ema_states_dict,
best_ema_model_dir)
update_train_results(cli_args,
Expand Down
5 changes: 4 additions & 1 deletion tools/train.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ def main(args):
utils.set_device(args.device)
utils.set_cv2_num_threads(args.num_workers)
uniform_output_enabled = cfg.dic.get("uniform_output_enabled", False)
export_during_train = cfg.dic.get("export_during_train", False)
if uniform_output_enabled:
if not os.path.exists(args.save_dir):
os.makedirs(args.save_dir)
Expand Down Expand Up @@ -244,7 +245,9 @@ def main(args):
print_mem_info=print_mem_info,
shuffle=shuffle,
uniform_output_enabled=uniform_output_enabled,
cli_args=None if not uniform_output_enabled else args)
export_during_train=export_during_train,
cli_args=args
if export_during_train or uniform_output_enabled else None)


if __name__ == '__main__':
Expand Down