Errors in elemwise/kernel

Author: abergeron

src/gpuarray_elemwise.c

@@ -150,7 +150,7 @@ static int gen_elemwise_basic_kernel(GpuKernel *k, gpucontext *ctx,
 
   ktypes = calloc(p, sizeof(int));
   if (ktypes == NULL)
-    return GA_MEMORY_ERROR;
+    return error_sys(ctx->err, "calloc");
 
   p = 0;
 
@@ -282,23 +282,22 @@ static int check_basic(GpuElemwise *ge, void **args, int flags,
       if (num_arrays == 0)
         nd = ((GpuArray *)args[i])->nd;
       else if (((GpuArray *)args[i])->nd != nd)
-        return GA_VALUE_ERROR;
+        return error_fmt(ctx->err, GA_VALUE_ERROR, "Arg %u has differing nd = %u", i, ((GpuArray *)args[i])->nd);
       ++num_arrays;
       if (a == NULL && is_output(ge->args[i]))
         a = (GpuArray *)args[i];
     }
   }
 
-  /* No output arrays, this is an error */
   if (a == NULL)
-    return GA_VALUE_ERROR;
+    return error_set(ctx->err, GA_VALUE_ERROR, "No output arrays");
 
   /* Check if we need to grow the internal buffers */
   if (nd > ge->nd) {
     nnd = ge->nd * 2;
     while (nd > nnd) nnd *= 2;
     if (ge_grow(ge, nnd))
-      return GA_MEMORY_ERROR;
+      return error_sys(ctx->err, "ge_grow");
   }
 
   /* Now we know that all array arguments have the same number of
@@ -330,7 +329,7 @@ static int check_basic(GpuElemwise *ge, void **args, int flags,
           /* We can't broadcast outputs */
           if (ISCLR(flags, GE_BROADCAST) || is_output(ge->args[i]) ||
               v->dimensions[j] != 1) {
-            return GA_VALUE_ERROR;
+            return error_fmt(ctx->err, GA_VALUE_ERROR, "Mismatched dimension %u for input %u", j, i);
           }
         }
         /* If the dimension is 1 set the strides to 0 regardless since
@@ -370,7 +369,7 @@ static int call_basic(GpuElemwise *ge, void **args, size_t n, unsigned int nd,
   unsigned int p = 0, i, j, l;
   int err;
 
-  if (nd == 0) return GA_VALUE_ERROR;
+  if (nd == 0) return error_set(GpuKernel_context(&ge->k_contig)->err, GA_VALUE_ERROR, "nd == 0");
 
   if (call32)
     k = &ge->k_basic_32[nd-1];
@@ -434,7 +433,7 @@ static int gen_elemwise_contig_kernel(GpuKernel *k,
   unsigned int p;
   unsigned int j;
   int flags = GA_USE_CLUDA;
-  int res = GA_MEMORY_ERROR;
+  int res;
 
   flags |= gpuarray_type_flagsa(n, args);
 
@@ -443,8 +442,10 @@ static int gen_elemwise_contig_kernel(GpuKernel *k,
     p += ISSET(args[j].flags, GE_SCALAR) ? 1 : 2;
 
   ktypes = calloc(p, sizeof(int));
-  if (ktypes == NULL)
+  if (ktypes == NULL) {
+    res = error_fmt(ctx->err, "calloc");
     goto bail;
+  }
 
   p = 0;
 
@@ -509,8 +510,10 @@ static int gen_elemwise_contig_kernel(GpuKernel *k,
   }
   strb_appends(&sb, "}\n}\n");
 
-  if (strb_error(&sb))
+  if (strb_error(&sb)) {
+    error_set(ctx->err, GA_MISC_ERROR, "Formatting error creating kernel source");
     goto bail;
+  }
 
   res = GpuKernel_init(k, ctx, 1, (const char **)&sb.s, &sb.l, "elem",
                        p, ktypes, flags, err_str);
@@ -523,6 +526,7 @@ static int gen_elemwise_contig_kernel(GpuKernel *k,
 static int check_contig(GpuElemwise *ge, void **args,
                         size_t *_n, int *contig) {
   GpuArray *a = NULL, *v;
+  gpucontext *ctx = GpuKernel_context(&ge->k_contig);
   size_t n = 1;
   unsigned int i, j;
   int c_contig = 1, f_contig = 1;
@@ -538,10 +542,10 @@ static int check_contig(GpuElemwise *ge, void **args,
       f_contig &= GpuArray_IS_F_CONTIGUOUS(v);
       if (a != v) {
         if (a->nd != v->nd)
-          return GA_INVALID_ERROR;
+          return error_set(ctx->err, GA_INVALID_ERROR, "Mismatched nd");
         for (j = 0; j < a->nd; j++) {
           if (v->dimensions[j] != a->dimensions[j])
-            return GA_VALUE_ERROR;
+            return error_fmt(ctx->err, GA_VALUE_ERROR, "Mismatched dimension %u", j);
         }
       }
     }

src/gpuarray_kernel.c

@@ -12,7 +12,7 @@ int GpuKernel_init(GpuKernel *k, gpucontext *ctx, unsigned int count,
 
   k->args = calloc(argcount, sizeof(void *));
   if (k->args == NULL)
-    return GA_MEMORY_ERROR;
+    return error_sys(ctx->err, "calloc");
   k->k = gpukernel_init(ctx, count, strs, lens, name, argcount, types,
                         flags, &res, err_str);
   if (res != GA_NO_ERROR)