Skip to content

P
pytensor
提交 ff832383 authored 作者: turian@grenat.iro.umontreal.ca's avatar turian@grenat.iro.umontreal.ca
浏览文件
操作

Renamed ResultBase to Result

上级 0adda1ff
隐藏空白字符变更
内嵌 并排
正在显示 包含 134 行增加 和 132 行删除
_test_compile.py
浏览文件 @ ff832383
......@@ -3,11 +3,11 @@ import gof, gof.modes, gof.opt
from compile import *
class Double(gof.result.ResultBase):
class Double(gof.result.Result):
def __init__(self, data, name = "oignon"):
assert isinstance(data, float)
gof.result.ResultBase.__init__(self, role = None, name = name)
gof.result.Result.__init__(self, role = None, name = name)
self.data = data
def __str__(self):
......
_test_elemwise.py
浏览文件 @ ff832383
......@@ -2,7 +2,7 @@
import time
import unittest
from gof import ResultBase, Op, Env, modes
from gof import Result, Op, Env, modes
import gof
from scalar import *
......
_test_gradient.py
浏览文件 @ ff832383
......@@ -14,8 +14,8 @@ class _test_grad_sources_inputs(unittest.TestCase):
"""Test that it is not ok to return None from op.grad()"""
class retNone(gof.op.Op):
def __init__(self, arg):
self.inputs = [gof.result.ResultBase()]
self.outputs = [gof.result.ResultBase()]
self.inputs = [gof.result.Result()]
self.outputs = [gof.result.Result()]
def grad(self, (x, ), (gz, )):
pass
a = retNone(5)
......@@ -30,10 +30,10 @@ class _test_grad_sources_inputs(unittest.TestCase):
class retNone(gof.op.Op):
def __init__(self, arg):
self.inputs = arg
self.outputs = [gof.result.ResultBase()]
self.outputs = [gof.result.Result()]
def grad(self, (x, ), (gz, )):
return [None]
i = gof.result.ResultBase()
i = gof.result.Result()
a = retNone([i])
g = grad_sources_inputs([(a.out, 1)], None)
self.failUnless(not i in g)
......@@ -43,12 +43,12 @@ class _test_grad_sources_inputs(unittest.TestCase):
class retNone(gof.op.Op):
def __init__(self, arg):
self.inputs = arg
self.outputs = [gof.result.ResultBase()]
self.outputs = [gof.result.Result()]
def grad(self, inputs, (gz, )):
return [None]
i = gof.result.ResultBase()
j = gof.result.ResultBase()
i = gof.result.Result()
j = gof.result.Result()
a1 = retNone([i])
g = grad_sources_inputs([(a1.out, 1)], None)
a2 = retNone([i,j])
......@@ -65,22 +65,22 @@ class _test_grad_sources_inputs(unittest.TestCase):
class retNone(gof.op.Op):
def __init__(self, arg, tst):
self.inputs = arg
self.outputs = [gof.result.ResultBase()]
self.outputs = [gof.result.Result()]
self.tst = tst
def grad(self, inputs, (gz, )):
self.tst.fail()
i = gof.result.ResultBase()
i = gof.result.Result()
a1 = retNone([i],self)
g = grad_sources_inputs([(a1.out, None)], None)
def test_1in_1out(self):
"""Test grad is called correctly for a 1-to-1 op"""
gval = gof.result.ResultBase()
gval = gof.result.Result()
class O(gof.op.Op):
def __init__(self):
self.inputs = [gof.result.ResultBase()]
self.outputs = [gof.result.ResultBase()]
self.inputs = [gof.result.Result()]
self.outputs = [gof.result.Result()]
def grad(self, (x, ), (gz, )):
return gval,
a1 = O()
......@@ -89,11 +89,11 @@ class _test_grad_sources_inputs(unittest.TestCase):
def test_1in_Nout(self):
"""Test grad is called correctly for a 1-to-many op"""
gval = gof.result.ResultBase()
gval = gof.result.Result()
class O(gof.op.Op):
def __init__(self):
self.inputs = [gof.result.ResultBase()]
self.outputs = [gof.result.ResultBase(),gof.result.ResultBase()]
self.inputs = [gof.result.Result()]
self.outputs = [gof.result.Result(),gof.result.Result()]
def grad(self, (x, ), (gz1, gz2)):
return gval,
a1 = O()
......@@ -101,12 +101,12 @@ class _test_grad_sources_inputs(unittest.TestCase):
self.failUnless(g[a1.inputs[0]] is gval)
def test_Nin_1out(self):
"""Test grad is called correctly for a many-to-1 op"""
gval0 = gof.result.ResultBase()
gval1 = gof.result.ResultBase()
gval0 = gof.result.Result()
gval1 = gof.result.Result()
class O(gof.op.Op):
def __init__(self):
self.inputs = [gof.result.ResultBase(),gof.result.ResultBase()]
self.outputs = [gof.result.ResultBase()]
self.inputs = [gof.result.Result(),gof.result.Result()]
self.outputs = [gof.result.Result()]
def grad(self, (x0,x1), (gz, )):
return (gval0, gval1)
a1 = O()
......@@ -115,12 +115,12 @@ class _test_grad_sources_inputs(unittest.TestCase):
self.failUnless(g[a1.inputs[1]] is gval1)
def test_Nin_Nout(self):
"""Test grad is called correctly for a many-to-many op"""
gval0 = gof.result.ResultBase()
gval1 = gof.result.ResultBase()
gval0 = gof.result.Result()
gval1 = gof.result.Result()
class O(gof.op.Op):
def __init__(self):
self.inputs = [gof.result.ResultBase(),gof.result.ResultBase()]
self.outputs = [gof.result.ResultBase(),gof.result.ResultBase()]
self.inputs = [gof.result.Result(),gof.result.Result()]
self.outputs = [gof.result.Result(),gof.result.Result()]
def grad(self, (x0,x1), (gz0,gz1)):
return gval0, gval1
a1 = O()
......@@ -132,11 +132,11 @@ class _test_grad_sources_inputs(unittest.TestCase):
class O(gof.op.Op):
def __init__(self, arg, tst):
self.inputs = arg
self.outputs = [gof.result.ResultBase(),gof.result.ResultBase()]
self.outputs = [gof.result.Result(),gof.result.Result()]
self.tst = tst
def grad(self, inputs, g_out):
return [1]
i = gof.result.ResultBase()
i = gof.result.Result()
a1 = O([i],self)
g = grad_sources_inputs([(a1.outputs[0], 1)], None)
self.failUnless(g[i] is 1)
......@@ -146,7 +146,7 @@ class _test_grad_sources_inputs(unittest.TestCase):
class O(gof.op.Op):
def __init__(self, arg, tst, grad_ok):
self.inputs = arg
self.outputs = [gof.result.ResultBase(),gof.result.ResultBase()]
self.outputs = [gof.result.Result(),gof.result.Result()]
self.tst = tst
self.grad_ok = grad_ok
def grad(self, inputs, g_out):
......@@ -154,9 +154,9 @@ class _test_grad_sources_inputs(unittest.TestCase):
self.tst.fail()
else:
return [1, None]
i = gof.result.ResultBase()
j = gof.result.ResultBase()
k = gof.result.ResultBase()
i = gof.result.Result()
j = gof.result.Result()
k = gof.result.Result()
a1 = O([i,j],self,True)
a2 = O([a1.outputs[1], k], self, True)
g = grad_sources_inputs([(a2.outputs[0], 1)], None)
......@@ -172,7 +172,7 @@ class _test_grad_sources_inputs(unittest.TestCase):
class O(gof.op.Op):
def __init__(self, arg, tst, grad_ok):
self.inputs = arg
self.outputs = [gof.result.ResultBase(),gof.result.ResultBase()]
self.outputs = [gof.result.Result(),gof.result.Result()]
self.tst = tst
self.grad_ok = grad_ok
def grad(self, inputs, (g0,g1)):
......@@ -183,9 +183,9 @@ class _test_grad_sources_inputs(unittest.TestCase):
return [g0, g0+g1]
else:
return [g0, g0]
i = gof.result.ResultBase()
j = gof.result.ResultBase()
k = gof.result.ResultBase()
i = gof.result.Result()
j = gof.result.Result()
k = gof.result.Result()
a1 = O([i,j],self,True)
a2 = O([k,a1.outputs[1]], self, True)
g = grad_sources_inputs([(a2.outputs[0], 1), (a1.outputs[1],4),
......@@ -202,7 +202,7 @@ class _test_grad_sources_inputs(unittest.TestCase):
class O(gof.op.Op):
def __init__(self, arg, tst, grad_ok):
self.inputs = arg
self.outputs = [gof.result.ResultBase(),gof.result.ResultBase()]
self.outputs = [gof.result.Result(),gof.result.Result()]
self.tst = tst
self.grad_ok = grad_ok
def grad(self, inputs, (g0,g1)):
......@@ -213,9 +213,9 @@ class _test_grad_sources_inputs(unittest.TestCase):
return [g0, g0+g1]
else:
return [g0, g0]
i = gof.result.ResultBase()
j = gof.result.ResultBase()
k = gof.result.ResultBase()
i = gof.result.Result()
j = gof.result.Result()
k = gof.result.Result()
a1 = O([i,j],self,True)
a2 = O([k,a1.outputs[1]], self, True)
g = grad_sources_inputs([(a2.outputs[0], 1), (a1.outputs[1],4),
......@@ -231,10 +231,10 @@ class _test_grad_sources_inputs(unittest.TestCase):
class _test_grad(unittest.TestCase):
class O(gof.op.Op):
def __init__(self):
self.inputs = [gof.result.ResultBase(),gof.result.ResultBase()]
self.outputs = [gof.result.ResultBase(),gof.result.ResultBase()]
self.gval0 = gof.result.ResultBase()
self.gval1 = gof.result.ResultBase()
self.inputs = [gof.result.Result(),gof.result.Result()]
self.outputs = [gof.result.Result(),gof.result.Result()]
self.gval0 = gof.result.Result()
self.gval1 = gof.result.Result()
def grad(self, (x0,x1), (gz0,gz1)):
return self.gval0, self.gval1
......
_test_scalar.py
浏览文件 @ ff832383
import unittest
from gof import ResultBase, Op, Env, modes
from gof import Result, Op, Env, modes
import gof
from scalar import *
......
_test_sparse.py
浏览文件 @ ff832383
......@@ -104,7 +104,7 @@ class _testCase_dot(unittest.TestCase):
m = mtype(a)
ab = m.dot(b)
try:
z = dot(SparseR(m),core.ResultBase(data=b))
z = dot(SparseR(m),core.Result(data=b))
self.failUnless(z.data.shape == ab.shape)
self.failUnless(type(z.data) == type(ab))
except Exception, e:
......@@ -121,7 +121,7 @@ class _testCase_dot(unittest.TestCase):
sparse.lil_matrix]:#, sparse.coo_matrix]:
m = mtype(b)
ab = m.transpose().dot(a.transpose()).transpose()
z = dot(core.ResultBase(data=a),SparseR(mtype(b)))
z = dot(core.Result(data=a),SparseR(mtype(b)))
self.failUnless(z.data.shape == ab.shape)
self.failUnless(type(z.data) == type(ab))
......
base_tensor.py
浏览文件 @ ff832383
"""A simple class to store ndarray data """
from gof import ResultBase, Op, utils, AbstractFunctionError
from gof import Result, Op, utils, AbstractFunctionError
import numpy
from copy import copy
......@@ -9,8 +9,8 @@ from copy import copy
# BaseTensor Class
###########################
class BaseTensor(ResultBase):
"""ResultBase to store numpy.ndarray or equivalent via .data
class BaseTensor(Result):
"""Result to store numpy.ndarray or equivalent via .data
Attributes:
_dtype - numpy dtype string such as 'int64' or 'float64' (among others)
......@@ -43,13 +43,13 @@ class BaseTensor(ResultBase):
# the argument that is awkward to construct, I decided to put all this
# into the tensor(data,...) function below, which is like a second
# constructor that works with an ndarray.
ResultBase.__init__(self, role=role, name=name)
Result.__init__(self, role=role, name=name)
self._dtype = str(dtype)
self.dtype_specs() # this is just for error checking
self._broadcastable = tuple(broadcastable)
######################
# ResultBase interface
# Result interface
######################
#
......
gof/_test_cc.py
浏览文件 @ ff832383
......@@ -3,14 +3,14 @@ import unittest
from link import PerformLinker, Profiler
from cc import *
from result import ResultBase
from result import Result
from op import Op
from env import Env
class Double(ResultBase):
class Double(Result):
def __init__(self, data, name = "oignon"):
ResultBase.__init__(self, role = None, name = name)
Result.__init__(self, role = None, name = name)
assert isinstance(data, float)
self.data = data
......
gof/_test_ext.py
浏览文件 @ ff832383
import unittest
from result import ResultBase
from result import Result
from op import Op
from opt import PatternOptimizer, OpSubOptimizer
......
gof/_test_graph.py
浏览文件 @ ff832383
......@@ -4,14 +4,14 @@ import unittest
from graph import *
from op import Op
from result import ResultBase
from result import Result
class MyResult(ResultBase):
class MyResult(Result):
def __init__(self, thingy):
self.thingy = thingy
ResultBase.__init__(self, role = None )
Result.__init__(self, role = None )
self.data = [self.thingy]
def __eq__(self, other):
......
gof/_test_link.py
浏览文件 @ ff832383
......@@ -2,7 +2,7 @@
import unittest
from result import ResultBase
from result import Result
from op import Op
from env import Env
......
gof/_test_modes.py
浏览文件 @ ff832383
......@@ -4,15 +4,15 @@ import unittest
from modes import *
from result import ResultBase
from result import Result
from op import Op
from env import Env
class Double(ResultBase):
class Double(Result):
def __init__(self, data, name = "oignon"):
ResultBase.__init__(self, role = None, name = name)
Result.__init__(self, role = None, name = name)
assert isinstance(data, float)
self.data = data
......
gof/_test_op.py
浏览文件 @ ff832383
......@@ -2,14 +2,14 @@
import unittest
from copy import copy
from op import *
from result import ResultBase
from result import Result
class MyResult(ResultBase):
class MyResult(Result):
def __init__(self, thingy):
self.thingy = thingy
ResultBase.__init__(self, role = None)
Result.__init__(self, role = None)
self.data = [self.thingy]
def __eq__(self, other):
......@@ -48,7 +48,7 @@ class _test_Op(unittest.TestCase):
# validate_update
def test_validate_update(self):
try:
MyOp(ResultBase(), MyResult(1)) # MyOp requires MyResult instances
MyOp(Result(), MyResult(1)) # MyOp requires MyResult instances
except Exception, e:
assert str(e) == "Error 1"
else:
......
gof/_test_opt.py
浏览文件 @ ff832383
import unittest
from result import ResultBase
from result import Result
from op import Op
from ext import Destroyer
from opt import *
......@@ -9,10 +9,10 @@ from env import Env
from toolbox import *
class MyResult(ResultBase):
class MyResult(Result):
def __init__(self, name):
ResultBase.__init__(self, role = None, name = name)
Result.__init__(self, role = None, name = name)
self.data = [1000]
def __str__(self):
......
gof/_test_result.py
浏览文件 @ ff832383
......@@ -3,10 +3,10 @@ import unittest
from result import *
class Double(ResultBase):
class Double(Result):
def __init__(self, data, name = "oignon"):
ResultBase.__init__(self, role = None, name = name)
Result.__init__(self, role = None, name = name)
assert isinstance(data, float)
self.data = data
......@@ -19,10 +19,10 @@ class Double(ResultBase):
def __copy__(self):
return Double(self.data, self.name)
class MyResult(ResultBase):
class MyResult(Result):
def __init__(self, name):
ResultBase.__init__(self, role = None, name = name)
Result.__init__(self, role = None, name = name)
self.data = [1000]
def __str__(self):
......@@ -35,12 +35,12 @@ class MyResult(ResultBase):
return MyResult(self.name)
class _test_ResultBase(unittest.TestCase):
class _test_Result(unittest.TestCase):
def test_trivial(self):
r = ResultBase()
r = Result()
def test_state(self):
r = ResultBase()
r = Result()
assert r.state is Empty
r.data = 0
......
gof/_test_toolbox.py
浏览文件 @ ff832383
import unittest
from result import ResultBase
from result import Result
from op import Op
from opt import PatternOptimizer, OpSubOptimizer
......@@ -10,10 +10,10 @@ from toolbox import *
class MyResult(ResultBase):
class MyResult(Result):
def __init__(self, name):
ResultBase.__init__(self, role = None, name = name)
Result.__init__(self, role = None, name = name)
self.data = [1000]
def __str__(self):
......
gof/opt.py
浏览文件 @ ff832383
from op import Op
from result import ResultBase
from result import Result
from env import InconsistencyError
import utils
import unify
......@@ -306,9 +306,9 @@ class PatternOptimizer(OpSpecificOptimizer):
return False
else:
u = u.merge(expr, v)
elif isinstance(pattern, ResultBase) \
elif isinstance(pattern, Result) \
and getattr(pattern, 'constant', False) \
and isinstance(expr, ResultBase) \
and isinstance(expr, Result) \
and getattr(expr, 'constant', False) \
and pattern.desc() == expr.desc():
return u
......@@ -415,9 +415,9 @@ class PatternDescOptimizer(LocalOptimizer):
return False
else:
u = u.merge(expr, v)
elif isinstance(pattern, ResultBase) \
elif isinstance(pattern, Result) \
and getattr(pattern, 'constant', False) \
and isinstance(expr, ResultBase) \
and isinstance(expr, Result) \
and getattr(expr, 'constant', False) \
and pattern.desc() == expr.desc():
return u
......
gof/result.py
浏览文件 @ ff832383
......@@ -9,7 +9,7 @@ import utils
from utils import AbstractFunctionError
__all__ = ['ResultBase',
__all__ = ['Result',
'PythonResult',
'StateError',
'Empty',
......@@ -24,7 +24,7 @@ class StateError(Exception):
"""The state of the Result is a problem"""
# ResultBase state keywords
# Result state keywords
class Empty : """Memory has not been allocated"""
class Allocated: """Memory has been allocated, contents are not the owner's output."""
class Computed : """Memory has been allocated, contents are the owner's output."""
......@@ -34,7 +34,7 @@ class Computed : """Memory has been allocated, contents are the owner's output."
# Result
############################
class ResultBase(object):
class Result(object):
"""Base class for storing Op inputs and outputs
Attributes:
......@@ -299,7 +299,7 @@ class ResultBase(object):
raise AbstractFunctionError()
class PythonResult(ResultBase):
class PythonResult(Result):
"""
Represents a generic Python object. The object is available
through %(name)s.
......
gradient.py
浏览文件 @ ff832383
......@@ -13,7 +13,7 @@ def _unpack_result(lst):
return lst[0]
def _pack_result(arg):
if isinstance(arg, gof.result.ResultBase):
if isinstance(arg, gof.result.Result):
return [arg]
else:
return arg
......
scalar.py
浏览文件 @ ff832383
......@@ -5,7 +5,7 @@ import math
from copy import copy
import inspect
from gof import ResultBase, GuardedOp, utils
from gof import Result, GuardedOp, utils
def as_scalar(x, name = None):
......@@ -21,10 +21,10 @@ def as_scalar(x, name = None):
return x
class Scalar(ResultBase):
class Scalar(Result):
def __init__(self, dtype, name = None):
ResultBase.__init__(self, role = None, name = name)
Result.__init__(self, role = None, name = name)
self.dtype = dtype
self.dtype_specs()
......
sparse.py
浏览文件 @ ff832383
......@@ -22,7 +22,7 @@ def assparse(sp, **kwargs):
rval.data = sp
return rval
class SparseR(gof.result.ResultBase):
class SparseR(gof.result.Result):
"""
Attribute:
format - a string identifying the type of sparsity
......@@ -49,7 +49,7 @@ class SparseR(gof.result.ResultBase):
@return An empty SparseR instance.
"""
gof.ResultBase.__init__(self, **kwargs)
gof.Result.__init__(self, **kwargs)
if dtype in SparseR.dtype_set:
self._dtype = dtype
assert isinstance(format, str)
......@@ -109,7 +109,7 @@ dense_from_sparse = gof.op.constructor(DenseFromSparse)
class SparseFromDense(gof.op.Op):
def __init__(self, x, format, **kwargs):
gof.op.Op.__init__(self, **kwargs)
if isinstance(format, gof.result.ResultBase):
if isinstance(format, gof.result.Result):
self.inputs = [tensor.astensor(x), format]
else:
self.inputs = [tensor.astensor(x), gof.result.PythonResult()]
......@@ -157,39 +157,41 @@ class AddSS(gof.op.Op): #add two sparse matrices
add_s_s = gof.op.constructor(AddSS)
if 0:
class dot(gof.op.Op):
"""
Attributes:
grad_preserves_dense - an array of boolean flags (described below)
class Dot(gof.op.Op):
def __init__(self, x, y):
def perform:
#return numpy.dot(x, y)
def grad:
grad_preserves_dense controls whether gradients with respect to inputs are
converted to dense matrices when the corresponding inputs are not in a
SparseR wrapper. This can be a good idea when dot is in the middle of a
larger graph, because the types of gx and gy will match those of x and y.
This conversion might be annoying if the gradients are graph outputs though,
hence this mask.
"""
def __init__(self, *args, **kwargs):
gof.op.Op.__init__(self, **kwargs)
self.grad_preserves_dense = [True, True]
def gen_outputs(self): return [SparseR()]
def impl(x,y):
if hasattr(x, 'getnnz'):
# if x is sparse, then do this.
return x.dot(y)
else:
# if x is dense (and y is sparse), we do this
return y.transpose().dot(x.transpose()).transpose()
def grad(self, x, y, gz):
rval = [dot(gz, y.T), dot(x.T, gz)]
for i in 0,1:
if not isinstance(self.inputs[i], SparseR):
#assume it is a dense matrix
if self.grad_preserves_dense[i]:
rval[i] = dense_from_sparse(rval[i])
return rval
"""
Attributes:
grad_preserves_dense - an array of boolean flags (described below)
grad_preserves_dense controls whether gradients with respect to inputs are
converted to dense matrices when the corresponding inputs are not in a
SparseR wrapper. This can be a good idea when dot is in the middle of a
larger graph, because the types of gx and gy will match those of x and y.
This conversion might be annoying if the gradients are graph outputs though,
hence this mask.
"""
def __init__(self, *args, **kwargs):
gof.op.Op.__init__(self, **kwargs)
self.grad_preserves_dense = [True, True]
def gen_outputs(self): return [SparseR()]
def impl(x,y):
if hasattr(x, 'getnnz'):
# if x is sparse, then do this.
return x.dot(y)
else:
# if x is dense (and y is sparse), we do this
return y.transpose().dot(x.transpose()).transpose()
def grad(self, x, y, gz):
rval = [dot(gz, y.T), dot(x.T, gz)]
for i in 0,1:
if not isinstance(self.inputs[i], SparseR):
#assume it is a dense matrix
if self.grad_preserves_dense[i]:
rval[i] = dense_from_sparse(rval[i])
return rval
tensor.py
浏览文件 @ ff832383
"""A ResultBase to store numpy.ndarray with basic accompanying Ops"""
"""A Result to store numpy.ndarray with basic accompanying Ops"""
import sys # for sys.maxint
import inspect
import numpy
from gof import ResultBase, Op, utils, Destroyer, Viewer, AbstractFunctionError
from gof import Result, Op, utils, Destroyer, Viewer, AbstractFunctionError
import gof.result
import gof.op
......@@ -260,7 +260,7 @@ class Subtensor(Op, Viewer):
debug = 0
def __init__(self, *args,**kwargs):
def as_tuple_result(obj):
if isinstance(obj, ResultBase):
if isinstance(obj, Result):
return obj
r = gof.result.PythonResult(None)
if isinstance(obj, tuple):
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论