LLNL / merlin

Machine Learning for HPC Workflows
MIT License
118 stars 26 forks source link

bugfix/status_nested_workspace #480

Closed bgunnar5 closed 3 months ago

bgunnar5 commented 3 months ago

This branch fixes two issues with the status command:

  1. It corrects a mistake I had made when creating the merge rules. Instead of using the initial value and logging a warning for merge conflicts involving status and return code, this should instead use the newer value and log a debug statement.
  2. It adds a check for nested workspaces when reading in status files that way we don't read any status files from "separate" workflows (these workflows may be nested workflows within a step, or even iterative workflows).
lucpeterson commented 3 months ago

Suggest we add some tests, especially for nested workflows logic

bgunnar5 commented 3 months ago

I'll add tests for nested workflow functionality next week and then ping you again

bgunnar5 commented 3 months ago

@lucpeterson this should be good to merge now