提交 c6acf425 authored 作者: abalkin's avatar abalkin

Recover from bad merge.

上级 041dcdb8
...@@ -2,11 +2,6 @@ import copy ...@@ -2,11 +2,6 @@ import copy
import scipy.sparse import scipy.sparse
from theano.compile import shared_constructor, SharedVariable from theano.compile import shared_constructor, SharedVariable
from theano.sparse.basic import SparseType, _sparse_py_operators from theano.sparse.basic import SparseType, _sparse_py_operators
<<<<<<< HEAD
=======
>>>>>>> 443c0ad... Replaced relative import with absolute.
class SparseTensorSharedVariable(_sparse_py_operators, SharedVariable): class SparseTensorSharedVariable(_sparse_py_operators, SharedVariable):
pass pass
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论