changed numpy imports in string

benchmark/convolution/conv2d.py

@@ -17,16 +17,16 @@ if len(sys.argv)>6:
 
 setup="""
 import sys, timeit, time
-import numpy
+import numpy as np
 import theano, theano.tensor.signal.conv
 
 img_shape =  int(sys.argv[1]), int(sys.argv[2])
 ker_shape =  int(sys.argv[3]), int(sys.argv[4])
 dtype = sys.argv[5]
 
-img = theano.shared(numpy.ones(img_shape, dtype=dtype))
-ker = theano.shared(numpy.ones(ker_shape, dtype=dtype))
-out = theano.shared(numpy.ones((2,2,2), dtype=dtype))
+img = theano.shared(np.ones(img_shape, dtype=dtype))
+ker = theano.shared(np.ones(ker_shape, dtype=dtype))
+out = theano.shared(np.ones((2,2,2), dtype=dtype))
 """
 
 T = timeit.Timer("f()", 

benchmark/convolution/opencv.py

@@ -16,13 +16,13 @@ if len(sys.argv)>6:
     nb_call=int(sys.argv[6])
 
 T = timeit.Timer("f()","""
-import scikits.image.opencv, sys, numpy
+import scikits.image.opencv, sys, numpy as np
 img_shape =  int(sys.argv[1]), int(sys.argv[2])
 ker_shape =  int(sys.argv[3]), int(sys.argv[4])
 dtype = sys.argv[5]
 
-img = numpy.ones(img_shape, dtype=dtype)
-ker = numpy.ones(ker_shape, dtype=dtype)
+img = np.ones(img_shape, dtype=dtype)
+ker = np.ones(ker_shape, dtype=dtype)
 
 def f():
     scikits.image.opencv.cvFilter2D(img, ker)