Skip to content

Commit 54dcf29

Browse files
authored
migrated base runtime to core (#380)
* migrated base runtime to core * add comments to init file * change runtime imports
1 parent 00a606f commit 54dcf29

File tree

9 files changed

+8
-69
lines changed

9 files changed

+8
-69
lines changed

merlin/systems/dag/runtimes/__init__.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, NVIDIA CORPORATION.
2+
# Copyright (c) 2023, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -14,5 +14,3 @@
1414
# limitations under the License.
1515
#
1616
# flake8: noqa
17-
18-
from .base_runtime import Runtime

merlin/systems/dag/runtimes/base_runtime.py

Lines changed: 0 additions & 59 deletions
This file was deleted.

merlin/systems/dag/runtimes/triton/runtime.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
from google.protobuf import text_format
2424

2525
from merlin.dag import postorder_iter_nodes
26+
from merlin.dag.runtime import Runtime
2627
from merlin.systems.dag.ops import compute_dims
2728
from merlin.systems.dag.ops.compat import (
2829
cuml_ensemble,
@@ -32,7 +33,6 @@
3233
xgboost,
3334
)
3435
from merlin.systems.dag.ops.workflow import TransformWorkflow
35-
from merlin.systems.dag.runtimes import Runtime
3636
from merlin.systems.dag.runtimes.triton.ops.operator import TritonOperator, add_model_param
3737
from merlin.systems.dag.runtimes.triton.ops.workflow import TransformWorkflowTriton
3838

tests/unit/systems/dag/runtimes/local/ops/fil/test_lightgbm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import pytest
44

55
from merlin.dag import ColumnSelector
6+
from merlin.dag.runtime import Runtime
67
from merlin.dtypes.shape import Shape
78
from merlin.schema import ColumnSchema, Schema
89
from merlin.systems.dag.ensemble import Ensemble
910
from merlin.systems.dag.ops.fil import PredictForest
10-
from merlin.systems.dag.runtimes.base_runtime import Runtime
1111
from merlin.table import TensorTable
1212

1313
sklearn_datasets = pytest.importorskip("sklearn.datasets")

tests/unit/systems/dag/runtimes/local/ops/fil/test_sklearn.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import pytest
44

55
from merlin.dag import ColumnSelector
6+
from merlin.dag.runtime import Runtime
67
from merlin.dtypes.shape import Shape
78
from merlin.schema import ColumnSchema, Schema
89
from merlin.systems.dag.ensemble import Ensemble
910
from merlin.systems.dag.ops.fil import PredictForest
10-
from merlin.systems.dag.runtimes.base_runtime import Runtime
1111
from merlin.table import TensorTable
1212

1313
sklearn_datasets = pytest.importorskip("sklearn.datasets")

tests/unit/systems/dag/runtimes/local/ops/fil/test_xgboost.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
from merlin.core.compat import HAS_GPU
66
from merlin.dag import ColumnSelector
7+
from merlin.dag.runtime import Runtime
78
from merlin.dtypes.shape import Shape
89
from merlin.schema import ColumnSchema, Schema
910
from merlin.systems.dag.ensemble import Ensemble
1011
from merlin.systems.dag.ops.fil import PredictForest
11-
from merlin.systems.dag.runtimes.base_runtime import Runtime
1212
from merlin.table import TensorTable
1313

1414
sklearn_datasets = pytest.importorskip("sklearn.datasets")

tests/unit/systems/dag/runtimes/local/ops/nvtabular/test_ensemble.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import numpy as np
1717
import pytest
1818

19-
from merlin.systems.dag.runtimes.base_runtime import Runtime
19+
from merlin.dag.runtime import Runtime
2020
from merlin.table import TensorTable
2121
from nvtabular import Workflow
2222
from nvtabular import ops as wf_ops

tests/unit/systems/dag/runtimes/local/ops/tensorflow/test_ensemble.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import pytest
1818

1919
from merlin.dag import ColumnSelector
20+
from merlin.dag.runtime import Runtime
2021
from merlin.schema import Tags
21-
from merlin.systems.dag.runtimes.base_runtime import Runtime
2222
from nvtabular import Workflow
2323
from nvtabular import ops as wf_ops
2424

tests/unit/systems/dag/runtimes/local/ops/torch/test_op.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import numpy as np
1919
import pytest
2020

21+
from merlin.dag.runtime import Runtime
2122
from merlin.schema import ColumnSchema, Schema
2223
from merlin.systems.dag.ensemble import Ensemble
23-
from merlin.systems.dag.runtimes.base_runtime import Runtime
2424
from merlin.table import TensorTable
2525

2626
torch = pytest.importorskip("torch")

0 commit comments

Comments
 (0)