From 2fcb33f10fcd5a368e61d5157e2fe9872bbf869c Mon Sep 17 00:00:00 2001
From: lukas leufen <l.leufen@fz-juelich.de>
Date: Fri, 26 Jun 2020 16:03:39 +0200
Subject: [PATCH] rename CustomWorkflow to Workflow and make workflow available
in src/
---
src/__init__.py | 3 ++-
src/workflows/__init__.py | 2 ++
src/workflows/abstract_workflow.py | 2 +-
src/workflows/default_workflow.py | 4 ++--
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/__init__.py b/src/__init__.py
index c013fb26..5b7073ff 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -5,7 +5,8 @@ __version_info__ = {
}
from src.run_modules import *
-from src.workflows.default_workflow import DefaultWorkflow
+from src.workflows import DefaultWorkflow, Workflow
+
def get_version():
diff --git a/src/workflows/__init__.py b/src/workflows/__init__.py
index e69de29b..184734ae 100644
--- a/src/workflows/__init__.py
+++ b/src/workflows/__init__.py
@@ -0,0 +1,2 @@
+from src.workflows.abstract_workflow import Workflow
+from src.workflows.default_workflow import DefaultWorkflow
\ No newline at end of file
diff --git a/src/workflows/abstract_workflow.py b/src/workflows/abstract_workflow.py
index 75b1ea04..5d4e62c8 100644
--- a/src/workflows/abstract_workflow.py
+++ b/src/workflows/abstract_workflow.py
@@ -8,7 +8,7 @@ from collections import OrderedDict
from src import RunEnvironment
-class AbstractWorkflow:
+class Workflow:
"""Abstract workflow class to handle sequence of stages (run modules). An inheriting class has to first initialise
this mother class and can afterwards add an arbitrary number of stages by using the add method. The execution order
is equal to the ordering of the stages have been added. To run the workflow, finally, a single call of the run
diff --git a/src/workflows/default_workflow.py b/src/workflows/default_workflow.py
index 8f87c4da..d20d8a73 100644
--- a/src/workflows/default_workflow.py
+++ b/src/workflows/default_workflow.py
@@ -6,10 +6,10 @@ __date__ = '2020-06-26'
import inspect
from src.helpers import remove_items
from src.run_modules import ExperimentSetup, PreProcessing, PartitionCheck, ModelSetup, Training, PostProcessing
-from src.workflows.abstract_workflow import AbstractWorkflow
+from src.workflows.abstract_workflow import Workflow
-class DefaultWorkflow(AbstractWorkflow):
+class DefaultWorkflow(Workflow):
"""A default workflow executing ExperimentSetup, PreProcessing, PartitionCheck, ModelSetup, Training and
PostProcessing in exact the mentioned ordering."""
--
GitLab