REVERT(yahoo#20, 94b7291): not asking edges for OPTIONALs ...

but still annotate edges with optional edge data-attribute.

Reverted bc Operation must not know its network, to belong to more than one.
Also the `Operation.net` contradicted `NetwotkOperation.net`;
the later indeed is the network it wraps
(not the net it is part of).

Author: ankostis

CHANGES.rst

@@ -21,8 +21,8 @@ Network:
   The end result is that operations in the graph that do not have all inputs satisfied,
   they are skipped (in v1.2.4 they crashed).
 
-  Also started annotating edges with optionals, to make proper use of the underlying
-  ``networkx`` graph.
+  Also started annotating edges with optional/sideffects, to make proper use of
+  the underlying ``networkx`` graph.
 
   |v130-flowchart|
 
@@ -109,6 +109,8 @@ Chore & Docs:
 - enh(:gh:`30`): added "API reference' chapter.
 - drop(build): ``sphinx_rtd_theme`` library is the default theme for Sphinx now.
 - enh(build): Add ``test`` *pip extras*.
+- sound: https://www.youtube.com/watch?v=-527VazA4IQ,
+  https://www.youtube.com/watch?v=8J182LRi8sU&t=43s
 
 
 

graphkit/base.py

@@ -35,10 +35,6 @@ class Operation(object):
     specific application.
     """
 
-    #: Owning :class:`~.network.Network`, set when added in a network.
-    #: Needed by `_compute()` to detect *optional needs* from edge-attributes.
-    net = None
-
     def __init__(self, **kwargs):
         """
         Create a new layer instance.

graphkit/functional.py

@@ -14,21 +14,18 @@ def __init__(self, **kwargs):
         Operation.__init__(self, **kwargs)
 
     def _compute(self, named_inputs, outputs=None):
-        assert self.net
-
         inputs = [
             named_inputs[n]
             for n in self.needs
-            if "optional" not in self.net.graph.get_edge_data(n, self)
-            and not isinstance(n, sideffect)
+            if not isinstance(n, optional) and not isinstance(n, sideffect)
         ]
 
         # Find any optional inputs in named_inputs.  Get only the ones that
         # are present there, no extra `None`s.
         optionals = {
             n: named_inputs[n]
             for n in self.needs
-            if "optional" in self.net.graph.get_edge_data(n, self) and n in named_inputs
+            if isinstance(n, optional) and n in named_inputs
         }
 
         # Combine params and optionals into one big glob of keyword arguments.

graphkit/network.py

@@ -184,10 +184,6 @@ def add_op(self, operation):
 
         self._cached_plans = {}
 
-        # functionalOperations don't have that set.
-        if not operation.net:
-            operation.net = self
-
         # add nodes and edges to graph describing the data needs for this layer
         for n in operation.needs:
             if isinstance(n, optional):

test/test_graphkit.py

@@ -61,8 +61,6 @@ def mul_op1(a, b):
     def pow_op1(a, exponent=2):
         return [math.pow(a, y) for y in range(1, exponent + 1)]
 
-    # `_compute()` needs a` nx-DiGraph in  op's `net` attribute.
-    compose("mock graph")(pow_op1)
     assert pow_op1._compute({"sum_ab": 2}, ["sum_ab_p2"]) == {"sum_ab_p2": 4.0}
 
     # Partial operation that is bound at a later time