Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

migrated base runtime to core #380

Merged
merged 6 commits into from
Jul 13, 2023
Merged

migrated base runtime to core #380

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0bc03ce
migrated base runtime to core
jperez999 Jul 6, 2023
95e4b85
add comments to init file
jperez999 Jul 12, 2023
b3c97a4
Merge branch 'main' into rm-base-runtime
jperez999 Jul 12, 2023
3fd0c7c
Merge branch 'main' of https://github.com/NVIDIA-Merlin/systems into …
jperez999 Jul 12, 2023
52ada89
change runtime imports
jperez999 Jul 12, 2023
9b5e70b
Merge branch 'rm-base-runtime' of https://github.com/jperez999/system…
jperez999 Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
migrated base runtime to core
  • Loading branch information
@jperez999
jperez999 committed Jul 6, 2023
commit 0bc03ce6ef681f1ad4cbde739a97925b1e4e71fd
18 changes: 0 additions & 18 deletions merlin/systems/dag/runtimes/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +0,0 @@
#
karlhigley marked this conversation as resolved.
Show resolved Hide resolved
# Copyright (c) 2022, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# flake8: noqa

from .base_runtime import Runtime
59 changes: 0 additions & 59 deletions merlin/systems/dag/runtimes/base_runtime.py
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion merlin/systems/dag/runtimes/triton/runtime.py
View file
Open in desktop
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.base_runtime import Runtime
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't really like the convention where the names of classes and packages start with "base." We were kind of painted into a corner with Operator vs BaseOperator, since Operator already existed and historically was the base class of all operators, but I'm thinking maybe the subpackage in Core should be called runtimes so this reads as from merlin.dag.runtimes import Runtime

Copy link
Collaborator Author

@jperez999 jperez999 Jul 12, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You good with making this change in a subsequent PR? If not we need to merge NVIDIA-Merlin/core#359 first.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's do 359 first

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
2 changes: 1 addition & 1 deletion tests/unit/systems/dag/runtimes/local/ops/fil/test_lightgbm.py
View file
Open in desktop
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.base_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
2 changes: 1 addition & 1 deletion tests/unit/systems/dag/runtimes/local/ops/fil/test_sklearn.py
View file
Open in desktop
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.base_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
2 changes: 1 addition & 1 deletion tests/unit/systems/dag/runtimes/local/ops/fil/test_xgboost.py
View file
Open in desktop
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.base_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
2 changes: 1 addition & 1 deletion tests/unit/systems/dag/runtimes/local/ops/nvtabular/test_ensemble.py
View file
Open in desktop
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.base_runtime import Runtime
from merlin.table import TensorTable
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/tensorflow/test_ensemble.py
View file
Open in desktop
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.base_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
View file
Open in desktop
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.base_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