From e451f8ef618fbdb2d9363356ecdb731593a6192c Mon Sep 17 00:00:00 2001 From: Callan Gray Date: Fri, 11 Mar 2022 17:07:00 +0800 Subject: [PATCH] add logger --- daliuge-translator/dlg/dropmake/lg.py | 3 -- .../dlg/dropmake/pg_generator.py | 29 ------------------- daliuge-translator/dlg/dropmake/pgt.py | 28 ++---------------- daliuge-translator/dlg/dropmake/pgtp.py | 26 +---------------- .../test/dropmake/test_pg_gen.py | 2 -- 5 files changed, 4 insertions(+), 84 deletions(-) diff --git a/daliuge-translator/dlg/dropmake/lg.py b/daliuge-translator/dlg/dropmake/lg.py index b26ebf2f9..33f12b901 100644 --- a/daliuge-translator/dlg/dropmake/lg.py +++ b/daliuge-translator/dlg/dropmake/lg.py @@ -28,7 +28,6 @@ if __name__ == "__main__": __package__ = "dlg.dropmake" -from collections import defaultdict import collections import datetime import json @@ -36,9 +35,7 @@ import math import os import random -import string import time -import io from itertools import product import numpy as np diff --git a/daliuge-translator/dlg/dropmake/pg_generator.py b/daliuge-translator/dlg/dropmake/pg_generator.py index 7881afdde..4e2e0793a 100644 --- a/daliuge-translator/dlg/dropmake/pg_generator.py +++ b/daliuge-translator/dlg/dropmake/pg_generator.py @@ -28,39 +28,10 @@ if __name__ == "__main__": __package__ = "dlg.dropmake" -from collections import defaultdict -import collections -import datetime import json import logging -import math -import os -import random import string import time -from itertools import product -from typing import ValuesView - -import networkx as nx -import numpy as np - -from .scheduler import MySarkarScheduler, DAGUtil, MinNumPartsScheduler, PSOScheduler -from .utils.bash_parameter import BashCommand -from ..common import dropdict -from ..common import Categories, DropType -from ..common import STORAGE_TYPES, APP_DROP_TYPES -from .dm_utils import ( - LG_APPREF, - getNodesKeyDict, - get_lg_ver_type, - convert_construct, - convert_fields, - convert_mkn, - getAppRefInputs, - LG_VER_EAGLE, - LG_VER_OLD, - LG_VER_EAGLE_CONVERTED, -) logger = logging.getLogger(__name__) diff --git a/daliuge-translator/dlg/dropmake/pgt.py b/daliuge-translator/dlg/dropmake/pgt.py index 5c8465295..579c10074 100644 --- a/daliuge-translator/dlg/dropmake/pgt.py +++ b/daliuge-translator/dlg/dropmake/pgt.py @@ -28,39 +28,17 @@ if __name__ == "__main__": __package__ = "dlg.dropmake" -from collections import defaultdict -import collections -import datetime + import json import logging import math -import os -import random -import string -import time -import io -from itertools import product - -import numpy as np from dlg.dropmake.lg import GraphException from dlg.dropmake.scheduler import DAGUtil -from dlg.dropmake.utils.bash_parameter import BashCommand from dlg.common import dropdict from dlg.common import Categories, DropType -from dlg.common import STORAGE_TYPES, APP_DROP_TYPES -from dlg.dropmake.dm_utils import ( - LG_APPREF, - getNodesKeyDict, - get_lg_ver_type, - convert_construct, - convert_fields, - convert_mkn, - getAppRefInputs, - LG_VER_EAGLE, - LG_VER_OLD, - LG_VER_EAGLE_CONVERTED, -) + +logger = logging.getLogger(__name__) class GPGTNoNeedMergeException(GraphException): diff --git a/daliuge-translator/dlg/dropmake/pgtp.py b/daliuge-translator/dlg/dropmake/pgtp.py index 122e6e184..16955c849 100644 --- a/daliuge-translator/dlg/dropmake/pgtp.py +++ b/daliuge-translator/dlg/dropmake/pgtp.py @@ -21,38 +21,14 @@ # from collections import defaultdict -import collections -import datetime import json import logging -import math -import os -import random -import string -import time -import io -from itertools import product import networkx as nx -import numpy as np from dlg.dropmake.pgt import PGT, GraphException from dlg.dropmake.scheduler import MySarkarScheduler, DAGUtil, MinNumPartsScheduler, PSOScheduler -from dlg.dropmake.utils.bash_parameter import BashCommand -from dlg.common import Categories, DropType -from dlg.common import STORAGE_TYPES, APP_DROP_TYPES -from dlg.dropmake.dm_utils import ( - LG_APPREF, - getNodesKeyDict, - get_lg_ver_type, - convert_construct, - convert_fields, - convert_mkn, - getAppRefInputs, - LG_VER_EAGLE, - LG_VER_OLD, - LG_VER_EAGLE_CONVERTED, -) +from dlg.common import DropType logger = logging.getLogger(__name__) diff --git a/daliuge-translator/test/dropmake/test_pg_gen.py b/daliuge-translator/test/dropmake/test_pg_gen.py index a9199b7c7..9856bb228 100644 --- a/daliuge-translator/test/dropmake/test_pg_gen.py +++ b/daliuge-translator/test/dropmake/test_pg_gen.py @@ -24,8 +24,6 @@ from dlg.dropmake.lg import LG from dlg.dropmake.pgt import PGT, GPGTNoNeedMergeException from dlg.dropmake.pgtp import MetisPGTP, MySarkarPGTP, MinNumPartsPGTP -from dlg.dropmake import pg_generator -from dlg.translator.tool_commands import unroll """ python -m unittest test.dropmake.test_pg_gen