Fixed small mistake in norm and swapaxes function.

theano/sandbox/linalg/ops.py

@@ -1226,10 +1226,10 @@ def norm(x,ord):
 	x = as_tensor_variable(x)
 	ndim = x.ndim
 	if ndim == 0:
-		raise TypeError
+		raise ValueError("'axis' entry is out of bounds.")
 	elif ndim == 1:
 		if ord == None:
-			z = (tensor.sum(x**2))**(0.5)
+			z = tensor.sum(x**2)**0.5
 			return z
 		elif ord == 'inf':
 			z = tensor.max(abs(x))
@@ -1238,13 +1238,13 @@ def norm(x,ord):
 			z = tensor.min(abs(x))
 			return z
 		elif ord == 0:
-			z = (x[x.nonzero()]).shape[0]
+			z = x[x.nonzero()].shape[0]
 			return z
 		else:
 			try:
-				z = (tensor.sum(abs(x**ord)))**(1./ord)
+				z = tensor.sum(abs(x**ord))**(1./ord)
 			except TypeError:
-				raise ValueError
+				raise ValueError("Invalid norm order for vectors.")
 			return z
 	elif ndim == 2:
 		if ord == None or ord == 'fro':
@@ -1266,7 +1266,6 @@ def norm(x,ord):
 			raise ValueError(0)
 
 
-
 class lstsq(theano.Op):
     def __eq__(self, other):
         pass
@@ -1292,4 +1291,3 @@ class lstsq(theano.Op):
         outputs[1][0] = zz[1]
         outputs[2][0] = zz[2]
         outputs[3][0] = zz[3]
->>>>>>> Fixed swapaxes function in var, indentation error in test_basic and added lstsq function in ops with tests.

theano/tensor/tests/test_basic.py

@@ -6902,7 +6902,7 @@ if __name__ == '__main__':
     t.test_infer_shape()
 
 class T_swapaxes(unittest.TestCase):                            
-	def test_no_dimensional_input(self):                                                        
+    def test_no_dimensional_input(self):                                                        
 		self.assertRaises(IndexError, swapaxes, 2, 0, 1)
         
 	def test_unidimensional_input(self):

theano/tensor/var.py

@@ -556,7 +556,7 @@ class _tensor_py_operators:
         """see 'theano.tensor.ptp'"""
 
         return theano.tensor.ptp(self, axis)
-        
+
     def swapaxes(self, axis1, axis2):
         """Return 'tensor.swapaxes(self, axis1, axis2)