Rename merlin.graph to merlin.dag (#22)

karlhigley · web-flow · commit b1a35941ebee · 2022-02-24T17:06:12.000-05:00
diff --git a/merlin/dag/__init__.py b/merlin/dag/__init__.py
diff --git a/merlin/dag/base_operator.py b/merlin/dag/base_operator.py
@@ -19,7 +19,7 @@
 from typing import Any, List, Union
 
 import merlin
-from merlin.graph.selector import ColumnSelector
+from merlin.dag.selector import ColumnSelector
 from merlin.schema import ColumnSchema, Schema
 
 
@@ -248,7 +248,7 @@ def label(self) -> str:
         return self.__class__.__name__
 
     def create_node(self, selector):
-        return merlin.graph.Node(selector)
+        return merlin.dag.Node(selector)
 
     @property
     def supports(self) -> Supports:
diff --git a/merlin/dag/graph.py b/merlin/dag/graph.py
@@ -17,7 +17,7 @@
 import logging
 from collections import deque
 
-from merlin.graph.node import (
+from merlin.dag.node import (
     Node,
     _combine_schemas,
     iter_nodes,
diff --git a/merlin/dag/node.py b/merlin/dag/node.py
@@ -15,9 +15,9 @@
 #
 import collections.abc
 
-from merlin.graph.base_operator import BaseOperator
-from merlin.graph.ops import ConcatColumns, SelectionOp, SubsetColumns, SubtractionOp
-from merlin.graph.selector import ColumnSelector
+from merlin.dag.base_operator import BaseOperator
+from merlin.dag.ops import ConcatColumns, SelectionOp, SubsetColumns, SubtractionOp
+from merlin.dag.selector import ColumnSelector
 from merlin.schema import Schema
 
 
diff --git a/merlin/dag/ops/__init__.py b/merlin/dag/ops/__init__.py
diff --git a/merlin/dag/ops/concat_columns.py b/merlin/dag/ops/concat_columns.py
@@ -15,8 +15,8 @@
 #
 
 from merlin.core.dispatch import DataFrameType
-from merlin.graph.base_operator import BaseOperator
-from merlin.graph.selector import ColumnSelector
+from merlin.dag.base_operator import BaseOperator
+from merlin.dag.selector import ColumnSelector
 from merlin.schema import Schema
 
 
diff --git a/merlin/dag/ops/identity.py b/merlin/dag/ops/identity.py
@@ -15,8 +15,8 @@
 #
 
 from merlin.core.dispatch import DataFrameType
-from merlin.graph.base_operator import BaseOperator
-from merlin.graph.selector import ColumnSelector
+from merlin.dag.base_operator import BaseOperator
+from merlin.dag.selector import ColumnSelector
 
 
 class Identity(BaseOperator):
diff --git a/merlin/dag/ops/selection.py b/merlin/dag/ops/selection.py
@@ -18,8 +18,8 @@
 import logging
 
 from merlin.core.dispatch import DataFrameType
-from merlin.graph.base_operator import BaseOperator
-from merlin.graph.selector import ColumnSelector
+from merlin.dag.base_operator import BaseOperator
+from merlin.dag.selector import ColumnSelector
 from merlin.schema import Schema
 
 LOG = logging.getLogger("SelectionOp")
diff --git a/merlin/dag/ops/subset_columns.py b/merlin/dag/ops/subset_columns.py
@@ -15,8 +15,8 @@
 #
 
 from merlin.core.dispatch import DataFrameType
-from merlin.graph.base_operator import BaseOperator
-from merlin.graph.selector import ColumnSelector
+from merlin.dag.base_operator import BaseOperator
+from merlin.dag.selector import ColumnSelector
 from merlin.schema import Schema
 
 
diff --git a/merlin/dag/ops/subtraction.py b/merlin/dag/ops/subtraction.py
@@ -16,8 +16,8 @@
 from __future__ import annotations
 
 from merlin.core.dispatch import DataFrameType
-from merlin.graph.base_operator import BaseOperator
-from merlin.graph.selector import ColumnSelector
+from merlin.dag.base_operator import BaseOperator
+from merlin.dag.selector import ColumnSelector
 from merlin.schema import Schema
 
 
diff --git a/merlin/dag/selector.py b/merlin/dag/selector.py
@@ -46,7 +46,7 @@ def __init__(
         self._tags = tags if tags is not None else []
         self.subgroups = subgroups if subgroups is not None else []
 
-        if isinstance(self._names, merlin.graph.Node):
+        if isinstance(self._names, merlin.dag.Node):
             raise TypeError("ColumnSelectors can not contain Nodes")
 
         if isinstance(self._names, str):
@@ -59,7 +59,7 @@ def __init__(
         for name in self._names:
             if isinstance(name, str):
                 plain_names.append(name)
-            elif isinstance(name, merlin.graph.Node):
+            elif isinstance(name, merlin.dag.Node):
                 raise ValueError("ColumnSelectors can not contain Nodes")
             elif isinstance(name, ColumnSelector):
                 self.subgroups.append(name)
@@ -101,7 +101,7 @@ def _nested_check(self, nests=0):
     def __add__(self, other):
         if other is None:
             return self
-        elif isinstance(other, merlin.graph.Node):
+        elif isinstance(other, merlin.dag.Node):
             return other + self
         elif isinstance(other, ColumnSelector):
 
@@ -121,7 +121,7 @@ def __radd__(self, other):
         return self + other
 
     def __rshift__(self, operator):
-        if isinstance(operator, type) and issubclass(operator, merlin.graph.BaseOperator):
+        if isinstance(operator, type) and issubclass(operator, merlin.dag.BaseOperator):
             # handle case where an operator class is passed
             operator = operator()
 
diff --git a/tests/unit/dag/ops/test_selection.py b/tests/unit/dag/ops/test_selection.py
@@ -15,8 +15,8 @@
 #
 import pytest
 
-from merlin.graph import ColumnSelector
-from merlin.graph.ops.selection import SelectionOp
+from merlin.dag import ColumnSelector
+from merlin.dag.ops.selection import SelectionOp
 from merlin.schema import ColumnSchema, Schema
 
 
diff --git a/tests/unit/dag/test_base_operator.py b/tests/unit/dag/test_base_operator.py
@@ -15,9 +15,9 @@
 #
 import pytest
 
-from merlin.graph.base_operator import BaseOperator as Operator
-from merlin.graph.graph import Graph
-from merlin.graph.selector import ColumnSelector
+from merlin.dag.base_operator import BaseOperator as Operator
+from merlin.dag.graph import Graph
+from merlin.dag.selector import ColumnSelector
 from merlin.schema import Schema
 
 
diff --git a/tests/unit/dag/test_column_schemas.py b/tests/unit/dag/test_column_schemas.py
@@ -18,7 +18,7 @@
 import numpy
 import pytest
 
-from merlin.graph.selector import ColumnSelector
+from merlin.dag.selector import ColumnSelector
 from merlin.schema import ColumnSchema, Schema
 from merlin.schema.io.tensorflow_metadata import TensorflowMetadata
 from merlin.schema.tags import Tags, TagSet
diff --git a/tests/unit/dag/test_column_selector.py b/tests/unit/dag/test_column_selector.py
@@ -15,10 +15,10 @@
 #
 import pytest
 
-from merlin.graph import BaseOperator
-from merlin.graph.node import Node
-from merlin.graph.ops.selection import SelectionOp
-from merlin.graph.selector import ColumnSelector
+from merlin.dag import BaseOperator
+from merlin.dag.node import Node
+from merlin.dag.ops.selection import SelectionOp
+from merlin.dag.selector import ColumnSelector
 from merlin.schema.tags import Tags
 
 
diff --git a/tests/unit/dag/test_tags.py b/tests/unit/dag/test_tags.py

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@`
`15`	`15`	`#`
`16`	`16`
`17`	`17`	`from merlin.core.dispatch import DataFrameType`
`18`		`-from merlin.graph.base_operator import BaseOperator`
`19`		`-from merlin.graph.selector import ColumnSelector`
	`18`	`+from merlin.dag.base_operator import BaseOperator`
	`19`	`+from merlin.dag.selector import ColumnSelector`
`20`	`20`	`from merlin.schema import Schema`
`21`	`21`
`22`	`22`