now uses inplace as op params for GpuGemm, GpuGemmBatch and GpuGemv

theano/gpuarray/blas.py

@@ -39,6 +39,7 @@ class GpuGemv(BlasOp):
     Gemv on the GPU.
 
     """
+    params_type = ParamsType(inplace=Scalar('bool'))
     __props__ = ('inplace',)
 
     def __init__(self, inplace=False):
@@ -69,9 +70,9 @@ class GpuGemv(BlasOp):
         beta = beta.astype(expected)
         return Apply(self, [y, alpha, A, x, beta], [y.type()])
 
-    def perform(self, node, inputs, out_storage):
+    def perform(self, node, inputs, out_storage, params):
         y, alpha, A, x, beta = inputs
-        inplace = self.inplace
+        inplace = params['inplace']
         if inplace and y.strides[0] < 0:
             inplace = False
         if A.shape[1] == 0:
@@ -83,10 +84,10 @@ class GpuGemv(BlasOp):
 
     def c_code(self, node, name, inp, out, sub):
         vars = dict(out=out[0], y=inp[0], alpha=inp[1], A=inp[2], x=inp[3],
-                    beta=inp[4], fail=sub['fail'], name=name)
-        if self.inplace:
+                    beta=inp[4], fail=sub['fail'], name=name,
+                    params=sub['params'])
         code = """
-                   if (%(y)s->ga.strides[0] <= 0) {
+               if (!%(params)s->inplace || %(y)s->ga.strides[0] <= 0) {
                  %(out)s = theano_try_copy(%(out)s, %(y)s);
                  if (%(out)s == NULL) {
                    %(fail)s
@@ -96,9 +97,6 @@ class GpuGemv(BlasOp):
                  %(out)s = %(y)s;
                  Py_INCREF(%(out)s);
                }
-                   """ % vars
-        else:
-            code = """
                %(out)s = theano_try_copy(%(out)s, %(y)s);
                if (%(out)s == NULL) {
                  %(fail)s
@@ -150,7 +148,7 @@ class GpuGemv(BlasOp):
         return code
 
     def c_code_cache_version(self):
-        return (7,)
+        return (8,)
 
 gpugemv_no_inplace = GpuGemv(inplace=False)
 gpugemv_inplace = GpuGemv(inplace=True)
@@ -161,6 +159,7 @@ class GpuGemm(BlasOp):
     Gemm on the GPU.
 
     """
+    params_type = ParamsType(inplace=Scalar('bool'))
     __props__ = ('inplace',)
     _f16_ok = True
 
@@ -200,9 +199,9 @@ class GpuGemm(BlasOp):
         assert C.ndim == 2
         return Apply(self, [C, alpha, A, B, beta], [C.type()])
 
-    def perform(self, node, inputs, outputs):
+    def perform(self, node, inputs, outputs, params):
         C, alpha, A, B, beta = inputs
-        inplace = self.inplace
+        inplace = params['inplace']
         if inplace and not C.flags.forc:
             inplace = False
         outputs[0][0] = blas.gemm(alpha, A, B, beta, C,
@@ -210,10 +209,10 @@ class GpuGemm(BlasOp):
 
     def c_code(self, node, name, inp, out, sub):
         vars = dict(out=out[0], C=inp[0], alpha=inp[1], A=inp[2], B=inp[3],
-                    beta=inp[4], fail=sub['fail'], name=name)
-        if self.inplace:
+                    beta=inp[4], fail=sub['fail'], name=name,
+                    params=sub['params'])
         code = """
-                   if (!GpuArray_ISONESEGMENT(&%(C)s->ga)) {
+               if (!%(params)s->inplace || !GpuArray_ISONESEGMENT(&%(C)s->ga)) {
                  %(out)s = theano_try_copy(%(out)s, %(C)s);
                  if (%(out)s == NULL) {
                    %(fail)s
@@ -223,15 +222,6 @@ class GpuGemm(BlasOp):
                  %(out)s = %(C)s;
                  Py_INCREF(%(out)s);
                }
-                   """ % vars
-        else:
-            code = """
-                   %(out)s = theano_try_copy(%(out)s, %(C)s);
-                   if (%(out)s == NULL) {
-                       %(fail)s
-                   }
-                   """ % vars
-        code += """
                if (pygpu_blas_rgemm(cb_no_trans, cb_no_trans,
                                     ((dtype_%(alpha)s *)PyArray_DATA(%(alpha)s))[0],
                                     %(A)s, %(B)s,
@@ -247,7 +237,7 @@ class GpuGemm(BlasOp):
         return code
 
     def c_code_cache_version(self):
-        return (5,)
+        return (6,)
 
 gpugemm_no_inplace = GpuGemm(inplace=False)
 gpugemm_inplace = GpuGemm(inplace=True)
@@ -392,6 +382,7 @@ gpu_dot22 = GpuDot22()
 
 
 class GpuGemmBatch(BlasOp):
+    params_type = ParamsType(inplace=Scalar('bool'))
     __props__ = ('inplace',)
     _f16_ok = True
 
@@ -428,11 +419,11 @@ class GpuGemmBatch(BlasOp):
 
     def c_code(self, node, name, inp, out, sub):
         vars = dict(out=out[0], C=inp[0], alpha=inp[1], A=inp[2], B=inp[3],
-                    beta=inp[4], inplace=int(self.inplace),
+                    beta=inp[4], params=sub['params'],
                     fail=sub['fail'], name=name)
         code = """
         int err;
-        if (%(inplace)s){
+        if (%(params)s->inplace){
                    if (!GpuArray_ISONESEGMENT(&%(C)s->ga)) {
                      %(out)s = theano_try_copy(%(out)s, %(C)s);
                      if (%(out)s == NULL) {
@@ -468,7 +459,7 @@ class GpuGemmBatch(BlasOp):
         return code
 
     def c_code_cache_version(self):
-        return (2,)
+        return (3,)
 
 gpugemmbatch_no_inplace = GpuGemmBatch(inplace=False)
 gpugemmbatch_inplace = GpuGemmBatch(inplace=True)