Remove InferenceNode after migrating its functionality into the `No…

…de` class from Merlin Core (#379)

* rm inf node, operator and model registry

* rename inf operator to base operator

* readd model registry to systems

* remove model registry testing

merlin/systems/dag/__init__.py

@@ -17,4 +17,3 @@
 # alias submodules here to avoid breaking everything with moving to submodules
 # flake8: noqa
 from .ensemble import Ensemble
-from .node import Node

merlin/systems/dag/ops/faiss.py

@@ -22,12 +22,11 @@
 
 from merlin.core.dispatch import HAS_GPU
 from merlin.core.protocols import DataFrameLike, Transformable
-from merlin.dag import ColumnSelector
+from merlin.dag import BaseOperator, ColumnSelector
 from merlin.schema import ColumnSchema, Schema
-from merlin.systems.dag.ops.operator import InferenceOperator
 
 
-class QueryFaiss(InferenceOperator):
+class QueryFaiss(BaseOperator):
     """
     This operator creates an interface between a FAISS[1] Approximate Nearest Neighbors (ANN)
     Index and Triton Infrence Server. The operator allows users to perform different supported

merlin/systems/dag/ops/feast.py

@@ -5,9 +5,8 @@
 from feast import FeatureStore, ValueType
 
 from merlin.core.protocols import Transformable
-from merlin.dag import ColumnSelector, DataFormats
+from merlin.dag import BaseOperator, ColumnSelector, DataFormats
 from merlin.schema import ColumnSchema, Schema
-from merlin.systems.dag.ops.operator import InferenceOperator
 
 # Feast_key: (numpy dtype, is_list, is_ragged)
 feast_2_numpy = {
@@ -20,7 +19,7 @@
 }
 
 
-class QueryFeast(InferenceOperator):
+class QueryFeast(BaseOperator):
     """
     The QueryFeast operator is responsible for ensuring that your feast feature store [1]
     can communicate correctly with tritonserver for the ensemble feast feature look ups.

merlin/systems/dag/ops/fil.py

@@ -22,6 +22,7 @@
 from merlin.core.dispatch import HAS_GPU
 from merlin.core.protocols import Transformable
 from merlin.dag import ColumnSelector  # noqa
+from merlin.dag import BaseOperator
 from merlin.schema import ColumnSchema, Schema  # noqa
 from merlin.systems.dag.ops.compat import (
     cuml_ensemble,
@@ -32,11 +33,10 @@
     treelite_sklearn,
     xgboost,
 )
-from merlin.systems.dag.ops.operator import InferenceOperator
 from merlin.table import TensorTable
 
 
-class PredictForest(InferenceOperator):
+class PredictForest(BaseOperator):
     """Operator for running inference on Forest models.
 
     This works for gradient-boosted decision trees (GBDTs) and Random forests (RF).
@@ -115,7 +115,7 @@ def transform(
         return type(transformable)(outputs)
 
 
-class FIL(InferenceOperator):
+class FIL(BaseOperator):
     """Operator for Forest Inference Library (FIL) models.
 
     Packages up XGBoost models to run on Triton inference server using the fil backend.

merlin/systems/dag/ops/implicit.py

@@ -19,9 +19,8 @@
 import numpy as np
 
 from merlin.core.protocols import Transformable
-from merlin.dag import ColumnSelector
+from merlin.dag import BaseOperator, ColumnSelector
 from merlin.schema import ColumnSchema, Schema
-from merlin.systems.dag.ops.operator import InferenceOperator
 
 try:
     import implicit
@@ -35,7 +34,7 @@
     implicit = None
 
 
-class PredictImplicit(InferenceOperator):
+class PredictImplicit(BaseOperator):
     """Operator for running inference on Implicit models.."""
 
     def __init__(self, model, num_to_recommend: int = 10, **kwargs):

merlin/systems/dag/ops/pytorch.py

@@ -19,13 +19,12 @@
 
 from merlin.core.compat.torch import torch
 from merlin.core.protocols import Transformable
-from merlin.dag import ColumnSelector
+from merlin.dag import BaseOperator, ColumnSelector
 from merlin.schema import Schema
-from merlin.systems.dag.ops.operator import InferenceOperator
 from merlin.table import TensorTable
 
 
-class PredictPyTorch(InferenceOperator):
+class PredictPyTorch(BaseOperator):
     """
     This operator takes a pytorch model and packages it correctly for tritonserver
     to run, on the pytorch backend.

merlin/systems/dag/ops/session_filter.py

@@ -17,12 +17,11 @@
 import numpy as np
 
 from merlin.core.protocols import Transformable
-from merlin.dag import ColumnSelector, Node
+from merlin.dag import BaseOperator, ColumnSelector, Node
 from merlin.schema import ColumnSchema, Schema
-from merlin.systems.dag.ops.operator import InferenceOperator
 
 
-class FilterCandidates(InferenceOperator):
+class FilterCandidates(BaseOperator):
     """
     This operator takes the input column and filters out elements of that column
     based on the supplied criteria.

merlin/systems/dag/ops/softmax_sampling.py

@@ -1,13 +1,13 @@
 import numpy as np
 
 from merlin.core.protocols import Transformable
+from merlin.dag import BaseOperator
 from merlin.dag.node import Node
 from merlin.dag.selector import ColumnSelector
 from merlin.schema import ColumnSchema, Schema
-from merlin.systems.dag.ops.operator import InferenceOperator
 
 
-class SoftmaxSampling(InferenceOperator):
+class SoftmaxSampling(BaseOperator):
     """
     Given inputs of ID and prediction, this operator will sort all
     inputs in descending order.