Skip to content

Commit

Permalink
migrated base runtime to core (#380)
Browse files Browse the repository at this point in the history
* migrated base runtime to core

* add comments to init file

* change runtime imports
  • Loading branch information
jperez999 authored Jul 13, 2023
1 parent 00a606f commit 54dcf29
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 69 deletions.
4 changes: 1 addition & 3 deletions merlin/systems/dag/runtimes/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022, NVIDIA CORPORATION.
# Copyright (c) 2023, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -14,5 +14,3 @@
# limitations under the License.
#
# flake8: noqa

from .base_runtime import Runtime
59 changes: 0 additions & 59 deletions merlin/systems/dag/runtimes/base_runtime.py

This file was deleted.

2 changes: 1 addition & 1 deletion merlin/systems/dag/runtimes/triton/runtime.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from google.protobuf import text_format

from merlin.dag import postorder_iter_nodes
from merlin.dag.runtime import Runtime
from merlin.systems.dag.ops import compute_dims
from merlin.systems.dag.ops.compat import (
cuml_ensemble,
Expand All @@ -32,7 +33,6 @@
xgboost,
)
from merlin.systems.dag.ops.workflow import TransformWorkflow
from merlin.systems.dag.runtimes import Runtime
from merlin.systems.dag.runtimes.triton.ops.operator import TritonOperator, add_model_param
from merlin.systems.dag.runtimes.triton.ops.workflow import TransformWorkflowTriton

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
import pytest

from merlin.dag import ColumnSelector
from merlin.dag.runtime import Runtime
from merlin.dtypes.shape import Shape
from merlin.schema import ColumnSchema, Schema
from merlin.systems.dag.ensemble import Ensemble
from merlin.systems.dag.ops.fil import PredictForest
from merlin.systems.dag.runtimes.base_runtime import Runtime
from merlin.table import TensorTable

sklearn_datasets = pytest.importorskip("sklearn.datasets")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
import pytest

from merlin.dag import ColumnSelector
from merlin.dag.runtime import Runtime
from merlin.dtypes.shape import Shape
from merlin.schema import ColumnSchema, Schema
from merlin.systems.dag.ensemble import Ensemble
from merlin.systems.dag.ops.fil import PredictForest
from merlin.systems.dag.runtimes.base_runtime import Runtime
from merlin.table import TensorTable

sklearn_datasets = pytest.importorskip("sklearn.datasets")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

from merlin.core.compat import HAS_GPU
from merlin.dag import ColumnSelector
from merlin.dag.runtime import Runtime
from merlin.dtypes.shape import Shape
from merlin.schema import ColumnSchema, Schema
from merlin.systems.dag.ensemble import Ensemble
from merlin.systems.dag.ops.fil import PredictForest
from merlin.systems.dag.runtimes.base_runtime import Runtime
from merlin.table import TensorTable

sklearn_datasets = pytest.importorskip("sklearn.datasets")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import numpy as np
import pytest

from merlin.systems.dag.runtimes.base_runtime import Runtime
from merlin.dag.runtime import Runtime
from merlin.table import TensorTable
from nvtabular import Workflow
from nvtabular import ops as wf_ops
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import pytest

from merlin.dag import ColumnSelector
from merlin.dag.runtime import Runtime
from merlin.schema import Tags
from merlin.systems.dag.runtimes.base_runtime import Runtime
from nvtabular import Workflow
from nvtabular import ops as wf_ops

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/systems/dag/runtimes/local/ops/torch/test_op.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
import numpy as np
import pytest

from merlin.dag.runtime import Runtime
from merlin.schema import ColumnSchema, Schema
from merlin.systems.dag.ensemble import Ensemble
from merlin.systems.dag.runtimes.base_runtime import Runtime
from merlin.table import TensorTable

torch = pytest.importorskip("torch")
Expand Down

0 comments on commit 54dcf29

Please sign in to comment.