removed compute() member functions from Op, Result

上级 514a561c
import time
import gof
import gof.lib
import cutils
import core
......@@ -177,7 +178,7 @@ class prog(gof.Prog):
for orphan in self.env.orphans():
if orphan.data is core.UNCOMPUTED:
if orphan.owner:
orphan.owner.compute()
gof.lib.compute(orphan.owner)
else:
raise Exception("Orphan %s is uncomputed but needed to calculate the function." % orphan)
......
......@@ -159,12 +159,6 @@ class ResultValue(Result):
self.up_to_date = True
self.refresh()
def compute(self):
#HACK: this is potentially very broken behaviour
"""Overrides Op.compute(). Only recurses if self.data is UNCOMPUTED"""
if self.data is UNCOMPUTED:
Result.compute(self)
####################################################
#
# Pure virtual functions for subclasses to implement
......
......@@ -212,12 +212,6 @@ class Op(object):
"""
return self.perform()
def compute(self):
"""Recursively perform() the ancestors of this node and then perform(self)."""
for input in self.inputs:
input.compute()
self.perform()
@classmethod
def require(cls):
"""
......
......@@ -100,15 +100,6 @@ class Result(object):
self._owner = owner
self._index = index
def compute(self):
"""If self has an owner, recursively compute it.
This is a mutually recursive function with gof.op.Op
"""
if self.owner:
self.owner.compute()
def perform(self):
"""Calls self.owner.perform() if self.owner exists.
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论