merged

_test_scalar.py

@@ -82,6 +82,19 @@ class _test_logical(unittest.TestCase):
         for a,b in ((3.,9), (3,0.9), (3,3)):
             self.failUnless(fn(a,b) == (a>=b))
 
+    def test_eq(self):
+        x, y, z = inputs()
+        fn = gof.DualLinker(Env([x,y], [eq(x,y)])).make_function()
+        for a,b in ((3.,9), (3,0.9), (3,3)):
+            self.failUnless(fn(a,b) == (a==b))
+
+    def test_neq(self):
+        x, y, z = inputs()
+        fn = gof.DualLinker(Env([x,y], [neq(x,y)])).make_function()
+        for a,b in ((3.,9), (3,0.9), (3,3)):
+            self.failUnless(fn(a,b) == (a!=b))
+
+
     def test_or(self):
         x, y, z = ints('xyz')
         fn = gof.DualLinker(Env([x,y], [x|y])).make_function()

scalar.py

@@ -388,6 +388,14 @@ class EQ(LogicalComparison):
         return x == y
 eq = EQ()
 
+class NEQ(LogicalComparison):
+    identity = False
+    commutative = True
+    associative = False
+    def impl(self, x, y):
+        return x != y
+neq = NEQ()
+
 ####################
 # BIT-WISE OPERATORS
 ####################

tensor.py

@@ -6,7 +6,7 @@ import numpy
 
 from copy import copy
 
-from gof import Result, Op, utils, AbstractFunctionError, Type, Result, Constant, Apply, Value
+from gof import Result, Op, utils, AbstractFunctionError, Type, Constant, Apply, Value
 import gof
 
 import blas # for gemm, dot
@@ -14,10 +14,13 @@ import gradient
 
 import elemwise as s2t
 import scalar as scal
+from gof.python25 import partial
+
 
+### set up the external interface
 from elemwise import Elemwise, DimShuffle, CAReduce
+import tensor_random as random
 
-from gof.python25 import partial
 
 
 def as_tensor(x, name = None):
@@ -518,6 +521,8 @@ lt, lt_inplace = _elemwise(scal.lt, 'lt')
 gt, gt_inplace = _elemwise(scal.gt, 'gt')
 le, le_inplace = _elemwise(scal.le, 'le')
 ge, ge_inplace = _elemwise(scal.ge, 'ge')
+eq, eq_inplace = _elemwise(scal.eq, 'eq')
+neq, neq_inplace = _elemwise(scal.neq, 'neq')
 
 
 ##########################