Merge pull request #1260 from lamblin/test_careduce_add

theano/misc/do_nightly_build

@@ -51,35 +51,46 @@ if [ "$RELEASE" ]; then
     THEANO_FLAGS=${FLAGS},compute_test_value=ignore ${NOSETESTS} ${ARGS}
     echo "Number of elements in the compiledir:"
     ls ${COMPILEDIR}|wc -l
+    echo
 fi
 
 echo "Executing tests with mode=FAST_COMPILE with --batch=1000"
+echo "THEANO_FLAGS=${FLAGS},mode=FAST_COMPILE ${NOSETESTS} --batch=1000 ${ARGS}"
 THEANO_FLAGS=${FLAGS},mode=FAST_COMPILE ${NOSETESTS} --batch=1000 ${ARGS}
 echo "Number of elements in the compiledir:"
 ls ${COMPILEDIR}|wc -l
+echo
 
 echo "Executing tests with mode=FAST_RUN"
+echo "THEANO_FLAGS=cmodule.warn_no_version=True,${FLAGS},mode=FAST_RUN ${NOSETESTS} ${PROFILING} ${ARGS}"
 THEANO_FLAGS=cmodule.warn_no_version=True,${FLAGS},mode=FAST_RUN ${NOSETESTS} ${PROFILING} ${ARGS}
 echo "Number of elements in the compiledir:"
 ls ${COMPILEDIR}|wc -l
+echo
 
 echo "Executing tests with mode=FAST_RUN,floatX=float32"
+echo "THEANO_FLAGS=${FLAGS},mode=FAST_RUN,floatX=float32 ${NOSETESTS} ${ARGS}"
 THEANO_FLAGS=${FLAGS},mode=FAST_RUN,floatX=float32 ${NOSETESTS} ${ARGS}
 echo "Number of elements in the compiledir:"
 ls ${COMPILEDIR}|wc -l
+echo
 
 echo "Executing tests with linker=vm,vm.lazy=True,floatX=float32"
+echo "THEANO_FLAGS=${FLAGS},linker=vm,vm.lazy=True,floatX=float32 ${NOSETESTS} ${ARGS}"
 THEANO_FLAGS=${FLAGS},linker=vm,vm.lazy=True,floatX=float32 ${NOSETESTS} ${ARGS}
 echo "Number of elements in the compiledir:"
 ls ${COMPILEDIR}|wc -l
+echo
 
 #we change the seed and record it everyday to test different combination. We record it to be able to reproduce bug caused by different seed. We don't want multiple test in DEBUG_MODE each day as this take too long.
 seed=$RANDOM
 echo "Executing tests with mode=DEBUG_MODE with seed of the day $seed"
+echo "THEANO_FLAGS=${FLAGS},unittests.rseed=$seed,mode=DEBUG_MODE,DebugMode.check_strides=0,DebugMode.patience=3,DebugMode.check_preallocated_output= ${NOSETESTS} ${ARGS}"
 THEANO_FLAGS=${FLAGS},unittests.rseed=$seed,mode=DEBUG_MODE,DebugMode.check_strides=0,DebugMode.patience=3,DebugMode.check_preallocated_output= ${NOSETESTS} ${ARGS}
 
 echo "Number of elements in the compiledir:"
 ls ${COMPILEDIR}|wc -l
+echo
 
 echo
 END=`date +%s`

theano/sandbox/cuda/tests/test_basic_ops.py

@@ -64,7 +64,9 @@ def test_careduce():
 
     TODO: test with broadcast
     """
-    for scalar_op in [theano.scalar.add, theano.scalar.maximum]:
+    for scalar_op, careduce_op in [
+            (theano.scalar.add, tensor.elemwise.CAReduceDtype),
+            (theano.scalar.maximum, tensor.CAReduce)]:
         for shape, pattern in [((1,1),(1,)),
                                ((1,0),(1,)),
                                ((0,1),(1,)),
@@ -119,7 +121,7 @@ def test_careduce():
 
                                ]:
 
-            op = tensor.CAReduce(scalar_op, axis=pattern)
+            op = careduce_op(scalar_op, axis=pattern)
             pat = tensor_pattern_to_gpu_pattern(shape, pattern)
             #GpuCAReduce{maximum} support only those patterns
             if scalar_op is theano.scalar.maximum and pat not in [
@@ -187,7 +189,7 @@ def test_careduce():
                                ((5,4),[0,1]),((5,4),[0]),
                                ((5,4,3),[0]),((5,4,3),[0,1]),((5,4,3),[2]),((5,4,3),[0,1,2]),
                                ((5,4,3,2),[0,1,2,3]), ((5,4,3,2),[0,2,3])]:
-            op = tensor.CAReduce(scalar_op, axis=pattern)
+            op = careduce_op(scalar_op, axis=pattern)
             pat = tensor_pattern_to_gpu_pattern(shape, pattern)
             #GpuCAReduce{maximum} support only those patterns
             if scalar_op is theano.scalar.maximum and pat not in [
@@ -219,7 +221,7 @@ def test_careduce():
                                ((5,4,3),[0]),((5,4,3),[0,1]),
                                ((5,4,3),[2]),((5,4,3),[0,1,2]),
                                ((5,4,3,2),[0,1,2,3]), ((5,4,3,2),[0,2,3])]:
-            op = tensor.CAReduce(scalar_op, axis=pattern)
+            op = careduce_op(scalar_op, axis=pattern)
             pat = tensor_pattern_to_gpu_pattern(shape, pattern)
             #GpuCAReduce{maximum} support only those patterns
             if scalar_op is theano.scalar.maximum and pat not in [

theano/tensor/elemwise.py

@@ -1242,6 +1242,7 @@ class CAReduce(Op):
             # We can't call self.__class__() as there is class that
             # inherit from CAReduce that don't have the same signature
             op = copy(self)
+            op.set_ufunc(op.scalar_op)
             op.axis = axis
         else:
             op = self
@@ -1733,8 +1734,10 @@ class CAReduceDtype(CAReduce):
             # Don't build another instance
             op = self
         else:
-            op = self.__class__(axis=self.axis,
-                                dtype=dtype, acc_dtype=acc_dtype)
+            op = copy(self)
+            op.set_ufunc(self.scalar_op)
+            op.dtype = dtype
+            op.acc_dtype = acc_dtype
 
         assert op.acc_dtype is not None
         return CAReduce.make_node(op, input)