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

removed scipy import when need needed and move it at one place.

I need to make theano work without scipy.
上级 4e233c08
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
import os, logging import os, logging
import numpy import numpy
import scipy.sparse as sp
from theano import gof from theano import gof
import theano.config as config import theano.config as config
...@@ -14,6 +13,8 @@ def check_equal(x, y): ...@@ -14,6 +13,8 @@ def check_equal(x, y):
Returns True iff x[0] and y[0] are equal (checks the dtype and Returns True iff x[0] and y[0] are equal (checks the dtype and
shape if x and y are numpy.ndarray instances). Used internally. shape if x and y are numpy.ndarray instances). Used internally.
""" """
#I put the import here to allow using theano without scipy.
import scipy.sparse as sp
x, y = x[0], y[0] x, y = x[0], y[0]
# TODO: bug in current scipy, two sparse matrices are never equal, remove when moving to 0.7 # TODO: bug in current scipy, two sparse matrices are never equal, remove when moving to 0.7
......
...@@ -18,9 +18,6 @@ else: ...@@ -18,9 +18,6 @@ else:
from theano.gof.python25 import any, all from theano.gof.python25 import any, all
# weave import
from scipy import weave
# gof imports # gof imports
import cutils import cutils
from env import Env from env import Env
......
...@@ -6,7 +6,7 @@ DownsampleFactorMax, DownsampleAvg, DownsampleSoftmax. ...@@ -6,7 +6,7 @@ DownsampleFactorMax, DownsampleAvg, DownsampleSoftmax.
""" """
#This file should move along with conv.py #This file should move along with conv.py
from theano import sparse, gof, Op, tensor, Variable, Apply from theano import gof, Op, tensor, Variable, Apply
from theano.printing import Print from theano.printing import Print
import numpy import numpy
import __builtin__ import __builtin__
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论