Skip to content

Commit

Permalink
Remove relative imports within morpheus_dfp
Browse files Browse the repository at this point in the history
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
  • Loading branch information
AnuradhaKaruppiah committed Oct 3, 2024
1 parent 0e4f6ba commit 6ec6dc1
Show file tree
Hide file tree
Showing 15 changed files with 40 additions and 55 deletions.
3 changes: 1 addition & 2 deletions python/morpheus_dfp/morpheus_dfp/modules/dfp_data_prep.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
from morpheus.utils.column_info import process_dataframe
from morpheus.utils.module_ids import MORPHEUS_MODULE_NAMESPACE
from morpheus.utils.module_utils import register_module

from ..utils.module_ids import DFP_DATA_PREP
from morpheus_dfp.utils.module_ids import DFP_DATA_PREP

logger = logging.getLogger(f"morpheus.{__name__}")

Expand Down
7 changes: 3 additions & 4 deletions python/morpheus_dfp/morpheus_dfp/modules/dfp_deployment.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@
from morpheus.utils.module_ids import MORPHEUS_MODULE_NAMESPACE
from morpheus.utils.module_utils import merge_dictionaries
from morpheus.utils.module_utils import register_module

from ..utils.module_ids import DFP_DEPLOYMENT
from ..utils.module_ids import DFP_INFERENCE_PIPE
from ..utils.module_ids import DFP_TRAINING_PIPE
from morpheus_dfp.utils.module_ids import DFP_DEPLOYMENT
from morpheus_dfp.utils.module_ids import DFP_INFERENCE_PIPE
from morpheus_dfp.utils.module_ids import DFP_TRAINING_PIPE

logger = logging.getLogger(f"morpheus.{__name__}")

Expand Down
5 changes: 2 additions & 3 deletions python/morpheus_dfp/morpheus_dfp/modules/dfp_inference.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,10 @@
from morpheus.messages import ControlMessage
from morpheus.utils.module_ids import MORPHEUS_MODULE_NAMESPACE
from morpheus.utils.module_utils import register_module
from morpheus_dfp.messages.dfp_message_meta import DFPMessageMeta
from morpheus_dfp.utils.model_cache import ModelCache
from morpheus_dfp.utils.model_cache import ModelManager

from ..messages.dfp_message_meta import DFPMessageMeta
from ..utils.module_ids import DFP_INFERENCE
from morpheus_dfp.utils.module_ids import DFP_INFERENCE

logger = logging.getLogger(f"morpheus.{__name__}")

Expand Down
13 changes: 6 additions & 7 deletions python/morpheus_dfp/morpheus_dfp/modules/dfp_inference_pipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,12 @@
from morpheus.utils.module_ids import WRITE_TO_FILE
from morpheus.utils.module_utils import merge_dictionaries
from morpheus.utils.module_utils import register_module

from ..utils.module_ids import DFP_DATA_PREP
from ..utils.module_ids import DFP_INFERENCE
from ..utils.module_ids import DFP_INFERENCE_PIPE
from ..utils.module_ids import DFP_POST_PROCESSING
from ..utils.module_ids import DFP_PREPROC
from ..utils.module_ids import DFP_ROLLING_WINDOW
from morpheus_dfp.utils.module_ids import DFP_DATA_PREP
from morpheus_dfp.utils.module_ids import DFP_INFERENCE
from morpheus_dfp.utils.module_ids import DFP_INFERENCE_PIPE
from morpheus_dfp.utils.module_ids import DFP_POST_PROCESSING
from morpheus_dfp.utils.module_ids import DFP_PREPROC
from morpheus_dfp.utils.module_ids import DFP_ROLLING_WINDOW

logger = logging.getLogger(f"morpheus.{__name__}")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
from morpheus.messages import ControlMessage
from morpheus.utils.module_ids import MORPHEUS_MODULE_NAMESPACE
from morpheus.utils.module_utils import register_module

from ..utils.module_ids import DFP_POST_PROCESSING
from morpheus_dfp.utils.module_ids import DFP_POST_PROCESSING

logger = logging.getLogger(f"morpheus.{__name__}")

Expand Down
5 changes: 2 additions & 3 deletions python/morpheus_dfp/morpheus_dfp/modules/dfp_preproc.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@
from morpheus.utils.module_ids import MORPHEUS_MODULE_NAMESPACE
from morpheus.utils.module_utils import merge_dictionaries
from morpheus.utils.module_utils import register_module

from ..utils.module_ids import DFP_PREPROC
from ..utils.module_ids import DFP_SPLIT_USERS
from morpheus_dfp.utils.module_ids import DFP_PREPROC
from morpheus_dfp.utils.module_ids import DFP_SPLIT_USERS

logger = logging.getLogger(f"morpheus.{__name__}")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,9 @@
from morpheus.messages import MessageMeta
from morpheus.utils.module_ids import MORPHEUS_MODULE_NAMESPACE
from morpheus.utils.module_utils import register_module

from ..utils.cached_user_window import CachedUserWindow
from ..utils.logging_timer import log_time
from ..utils.module_ids import DFP_ROLLING_WINDOW
from morpheus_dfp.utils.cached_user_window import CachedUserWindow
from morpheus_dfp.utils.logging_timer import log_time
from morpheus_dfp.utils.module_ids import DFP_ROLLING_WINDOW

logger = logging.getLogger(f"morpheus.{__name__}")

Expand Down
5 changes: 2 additions & 3 deletions python/morpheus_dfp/morpheus_dfp/modules/dfp_split_users.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@
from morpheus.messages import MessageMeta
from morpheus.utils.module_ids import MORPHEUS_MODULE_NAMESPACE
from morpheus.utils.module_utils import register_module

from ..utils.logging_timer import log_time
from ..utils.module_ids import DFP_SPLIT_USERS
from morpheus_dfp.utils.logging_timer import log_time
from morpheus_dfp.utils.module_ids import DFP_SPLIT_USERS

logger = logging.getLogger(f"morpheus.{__name__}")

Expand Down
5 changes: 2 additions & 3 deletions python/morpheus_dfp/morpheus_dfp/modules/dfp_training.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@
from morpheus.models.dfencoder import AutoEncoder
from morpheus.utils.module_ids import MORPHEUS_MODULE_NAMESPACE
from morpheus.utils.module_utils import register_module

from ..messages.dfp_message_meta import DFPMessageMeta
from ..utils.module_ids import DFP_TRAINING
from morpheus_dfp.messages.dfp_message_meta import DFPMessageMeta
from morpheus_dfp.utils.module_ids import DFP_TRAINING

logger = logging.getLogger(f"morpheus.{__name__}")

Expand Down
11 changes: 5 additions & 6 deletions python/morpheus_dfp/morpheus_dfp/modules/dfp_training_pipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@
from morpheus.utils.module_ids import MORPHEUS_MODULE_NAMESPACE
from morpheus.utils.module_utils import merge_dictionaries
from morpheus.utils.module_utils import register_module

from ..utils.module_ids import DFP_DATA_PREP
from ..utils.module_ids import DFP_PREPROC
from ..utils.module_ids import DFP_ROLLING_WINDOW
from ..utils.module_ids import DFP_TRAINING
from ..utils.module_ids import DFP_TRAINING_PIPE
from morpheus_dfp.utils.module_ids import DFP_DATA_PREP
from morpheus_dfp.utils.module_ids import DFP_PREPROC
from morpheus_dfp.utils.module_ids import DFP_ROLLING_WINDOW
from morpheus_dfp.utils.module_ids import DFP_TRAINING
from morpheus_dfp.utils.module_ids import DFP_TRAINING_PIPE

logger = logging.getLogger(f"morpheus.{__name__}")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@
from morpheus.messages import ControlMessage
from morpheus.pipeline.single_port_stage import SinglePortStage
from morpheus.pipeline.stage_schema import StageSchema

from ..utils.model_cache import ModelCache
from ..utils.model_cache import ModelManager
from morpheus_dfp.utils.model_cache import ModelCache
from morpheus_dfp.utils.model_cache import ModelManager

logger = logging.getLogger(f"morpheus.{__name__}")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,9 @@
from morpheus.messages import ControlMessage
from morpheus.pipeline.single_port_stage import SinglePortStage
from morpheus.pipeline.stage_schema import StageSchema

from ..messages.dfp_message_meta import DFPMessageMeta
from ..utils.cached_user_window import CachedUserWindow
from ..utils.logging_timer import log_time
from morpheus_dfp.messages.dfp_message_meta import DFPMessageMeta
from morpheus_dfp.utils.cached_user_window import CachedUserWindow
from morpheus_dfp.utils.logging_timer import log_time

logger = logging.getLogger(f"morpheus.{__name__}")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@
from morpheus.pipeline.single_port_stage import SinglePortStage
from morpheus.pipeline.stage_schema import StageSchema
from morpheus.utils.type_aliases import DataFrameType

from ..messages.dfp_message_meta import DFPMessageMeta
from ..utils.logging_timer import log_time
from morpheus_dfp.messages.dfp_message_meta import DFPMessageMeta
from morpheus_dfp.utils.logging_timer import log_time

logger = logging.getLogger(f"morpheus.{__name__}")

Expand Down
11 changes: 5 additions & 6 deletions python/morpheus_dfp/morpheus_dfp/utils/config_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@
from morpheus.messages import ControlMessage
from morpheus.utils.file_utils import load_labels_file
from morpheus.utils.module_ids import MORPHEUS_MODULE_NAMESPACE

from .dfp_arg_parser import DFPArgParser
from .dfp_arg_parser import pyobj2str
from .module_ids import DFP_DEPLOYMENT
from .regex_utils import iso_date_regex_pattern
from .schema_utils import Schema
from morpheus_dfp.utils.dfp_arg_parser import DFPArgParser
from morpheus_dfp.utils.dfp_arg_parser import pyobj2str
from morpheus_dfp.utils.module_ids import DFP_DEPLOYMENT
from morpheus_dfp.utils.regex_utils import iso_date_regex_pattern
from morpheus_dfp.utils.schema_utils import Schema


class ConfigGenerator:
Expand Down
3 changes: 1 addition & 2 deletions python/morpheus_dfp/morpheus_dfp/utils/model_cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
from mlflow.tracking.client import MlflowClient

from morpheus.models.dfencoder import AutoEncoder

from .logging_timer import log_time
from morpheus_dfp.utils.logging_timer import log_time

logger = logging.getLogger(f"morpheus.{__name__}")

Expand Down

0 comments on commit 6ec6dc1

Please sign in to comment.