diff --git a/CHANGELOG.md b/CHANGELOG.md index e338555..a96eb38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] ### Chnaged +- When saving cdr_json it now uses `-:` with just `-` and lower case. - pinned matplotlib version to 3.8.4 - updated validation submodule head diff --git a/pipeline.py b/pipeline.py index 16b2259..d718ba5 100644 --- a/pipeline.py +++ b/pipeline.py @@ -365,8 +365,8 @@ def construct_pipeline(args): infer_step = p.add_step(func=pipeline_steps.segmentation_inference, args=(legend_step.output(), model, devices), display='Segmenting Map Units', workers=infer_workers) geom_step = p.add_step(func=pipeline_steps.generate_geometry, args=(infer_step.output(), model.name, model.version), display='Generating Vector Geometry', workers=infer_workers*2) # Save Output - cdr_system_model = f"{args.cdr_system_version}_{args.model}" - save_step = p.add_step(func=pipeline_steps.save_output, args=(geom_step.output(), args.output, args.feedback, args.output_types, args.cdr_system, cdr_system_model), display='Saving Output', workers=infer_workers*2) + cdr_system_model = f"{args.cdr_system}-{args.model}".replace('_', '-').lower() + save_step = p.add_step(func=pipeline_steps.save_output, args=(geom_step.output(), args.output, args.feedback, args.output_types, cdr_system_model, args.cdr_system_version), display='Saving Output', workers=infer_workers*2) # Validation if args.validation: valid_step = p.add_step(func=pipeline_steps.validation, args=(geom_step.output(), args.validation, args.feedback), display='Validating Output', workers=infer_workers*2) @@ -407,8 +407,8 @@ def construct_amqp_pipeline(args): infer_step = p.add_step(func=pipeline_steps.segmentation_inference, args=(legend_step.output(), model, devices), display='Segmenting Map Units', workers=infer_workers) geom_step = p.add_step(func=pipeline_steps.generate_geometry, args=(infer_step.output(), model.name, model.version), display='Generating Vector Geometry', workers=infer_workers*2) # Save Output - cdr_system_model = f"{args.cdr_system_version}_{args.model}" - save_step = p.add_step(func=pipeline_steps.save_output, args=(geom_step.output(), args.output, args.feedback, args.output_types, args.cdr_system, cdr_system_model), display='Saving Output', workers=infer_workers*2) + cdr_system_model = f"{args.cdr_system}-{args.model}".replace('_', '-').lower() + save_step = p.add_step(func=pipeline_steps.save_output, args=(geom_step.output(), args.output, args.feedback, args.output_types, cdr_system_model, args.cdr_system_version), display='Saving Output', workers=infer_workers*2) # Validation if args.validation: valid_step = p.add_step(func=pipeline_steps.validation, args=(geom_step.output(), args.validation, args.feedback), display='Validating Output', workers=infer_workers*2)