scipy.signal.convolve2d causes errors on atexit. i moved imports to make it…

theano/sandbox/conv.py

@@ -2,8 +2,6 @@ import numpy as N
 import theano
 import theano.tensor as T
 from theano import gof, Op, tensor
-from scipy.signal.signaltools import  _valfrommode, _bvalfromboundary
-from scipy.signal.sigtools import _convolve2d
 from theano.printing import Print
 
 def getFilterOutShp(inshp, kshp, (dx,dy)=(1,1), mode='valid'):
@@ -60,6 +58,9 @@ class ConvOp(Op):
         """
         By default if len(img2d.shape)==3, we
         """
+        # TODO: move these back out to global scope when they no longer cause an atexit error
+        from scipy.signal.signaltools import  _valfrommode, _bvalfromboundary
+        from scipy.signal.sigtools import _convolve2d
         if z[0] is None:
             z[0] = N.zeros((self.bsize,)+(self.nkern,)+tuple(self.outshp))
         zz=z[0]

theano/sandbox/test_conv.py

@@ -3,9 +3,6 @@ import sys, time, unittest
 import numpy
 import numpy as N
 
-from scipy.signal import convolve2d
-from scipy.signal.sigtools import _convolve2d
-from scipy.signal.signaltools import  _valfrommode, _bvalfromboundary
 from theano.tests import unittest_tools as utt
 
 from theano import function, Mode
@@ -43,6 +40,7 @@ class TestConvOp(unittest.TestCase):
         print '\n\n*************************************************'
         print '           TEST CONVOLUTION' 
         print '*************************************************'
+        from scipy.signal import convolve2d
 
         if 0:
             # fixed parameters
@@ -189,6 +187,9 @@ class TestConvOp(unittest.TestCase):
         print 'speed up ConvOp vs convolve2d: %.3f'%d.mean(),d
 
     def test_multilayer_conv(self):
+        # causes an atexit problem
+        from scipy.signal.sigtools import _convolve2d
+        from scipy.signal.signaltools import  _valfrommode, _bvalfromboundary
         
         # fixed parameters
         bsize = 1 # batch size