Merge pull request #64 from delallea/generic_get_test_value

theano/gof/op.py

@@ -10,15 +10,20 @@ __contact__   = "theano-dev <theano-dev@googlegroups.com>"
 
 
 __docformat__ = "restructuredtext en"
+
+
 import logging
+import warnings
 
+import numpy
+
+import theano
 from theano import config
+
+import cc
 import graph
-import numpy
 import utils
-import warnings
 from env import Env
-import cc
 
 
 class CLinkerObject(object):
@@ -549,17 +554,16 @@ class Op(utils.object2, PureOp, CLinkerOp):
 
 def get_test_value(v):
     """
-    Extract test value from variable v. Raises AttributeError if there is none.
+    Extract test value from `v`. Raises AttributeError if there is none.
+
+    If input `v` is not already a variable, it is turned into one by calling
+    `as_tensor_variable(v)`, so that this function can be applied e.g.
+    on numpy arrays or Python lists and scalars, considering them as constants.
 
-    For an ndarray, the value is the ndarray itself
     For a Constant, the test value is v.value.
     For a Shared variable, it is the internal value.
-    For another Variable, it is the content of v.tag.test_value."""
-
-    try:
-        return PureOp._get_test_value(v)
-    except AttributeError:
-        if hasattr(v,'__array__'):
-            return v
-        raise
+    For another Variable, it is the content of v.tag.test_value.
+    """
+    v_tensor = theano.tensor.as_tensor_variable(v)
+    return PureOp._get_test_value(v_tensor)
 

theano/gof/tests/test_op.py

@@ -188,10 +188,16 @@ class TestMakeThunk(unittest.TestCase):
         assert compute_map[o][0]
         assert storage_map[o][0] == 4
 
+
+def test_test_value_python_objects():
+    for x in (range(3), 0, 0.5, 1):
+        assert (op.get_test_value(x) == x).all()
+
+
 def test_test_value_ndarray():
     x = numpy.zeros((5,5))
     v = op.get_test_value(x)
-    assert v is x
+    assert (v == x).all()
 
 def test_test_value_constant():
     x = T.as_tensor_variable(numpy.zeros((5,5)))