提交 e92cdf6d authored 作者: Frederic Bastien's avatar Frederic Bastien

removed old code not used anymore

上级 bd7d8d2e
...@@ -314,11 +314,6 @@ class TensorType(Type): ...@@ -314,11 +314,6 @@ class TensorType(Type):
When this is True, strict filtering rejects data containing NaN or Inf entries. (Used in `DebugMode`) When this is True, strict filtering rejects data containing NaN or Inf entries. (Used in `DebugMode`)
""" """
use_shape = False
"""
This should be removed (hardcoded to be False) after AISTATS09
"""
def __init__(self, dtype, broadcastable, name = None, shape=None): def __init__(self, dtype, broadcastable, name = None, shape=None):
"""Initialize self.dtype and self.broadcastable. """Initialize self.dtype and self.broadcastable.
...@@ -383,11 +378,6 @@ class TensorType(Type): ...@@ -383,11 +378,6 @@ class TensorType(Type):
if not data.ndim == self.ndim: if not data.ndim == self.ndim:
raise TypeError("%s expected a ndarray object with %s dimensions (got %s)." % (self, self.ndim, data.ndim)) raise TypeError("%s expected a ndarray object with %s dimensions (got %s)." % (self, self.ndim, data.ndim))
if TensorType.use_shape:
for si, di in zip(self.shape, data.shape):
if not (si is None or si == di):
raise TypeError('%s requires ndarray with shape matching %s (got %s)'%(
self, self.shape, data.shape))
return data return data
else: else:
data = theano._asarray(data, dtype = self.dtype) #TODO - consider to pad shape with ones data = theano._asarray(data, dtype = self.dtype) #TODO - consider to pad shape with ones
...@@ -432,13 +422,8 @@ class TensorType(Type): ...@@ -432,13 +422,8 @@ class TensorType(Type):
def __eq__(self, other): def __eq__(self, other):
"""Compare True iff other is the same kind of TensorType""" """Compare True iff other is the same kind of TensorType"""
if TensorType.use_shape: return type(self) == type(other) and other.dtype == self.dtype \
return type(self) == type(other) and other.dtype == self.dtype \ and other.broadcastable == self.broadcastable
and other.broadcastable == self.broadcastable \
and other.shape == self.shape
else:
return type(self) == type(other) and other.dtype == self.dtype \
and other.broadcastable == self.broadcastable
@staticmethod @staticmethod
def values_eq(a, b): def values_eq(a, b):
...@@ -509,10 +494,7 @@ class TensorType(Type): ...@@ -509,10 +494,7 @@ class TensorType(Type):
def __hash__(self): def __hash__(self):
"""Hash equal for same kinds of TensorType""" """Hash equal for same kinds of TensorType"""
if TensorType.use_shape: return hashtype(self) ^ hash(self.dtype) ^ hash(self.broadcastable)
return hashtype(self) ^ hash(self.dtype) ^ hash(self.broadcastable) ^ hash(self.shape)
else:
return hashtype(self) ^ hash(self.dtype) ^ hash(self.broadcastable)
ndim = property(lambda self: len(self.broadcastable), doc = "number of dimensions") ndim = property(lambda self: len(self.broadcastable), doc = "number of dimensions")
"""Number of dimensions """Number of dimensions
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论