Skip to content

Small things to help debug #424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nouiz merged 2 commits into from
Apr 28, 2017
Merged

Small things to help debug #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62cf1b9
A couple more error messages
lamblin Apr 27, 2017
83d1868
dump source and error message if compilation fail in DEBUG
lamblin Apr 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions src/gpuarray_array_blas.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
#include "gpuarray/buffer_blas.h"
#include "gpuarray/types.h"
#include "gpuarray/util.h"
#include "gpuarray/error.h"

#include "private.h"
#include "util/error.h"

int GpuArray_rdot(GpuArray *X, GpuArray *Y,
GpuArray *Z, int nocopy) {
Expand All @@ -13,24 +15,28 @@ int GpuArray_rdot(GpuArray *X, GpuArray *Y,
GpuArray copyY;
GpuArray *Zp = Z;
size_t n;
void *ctx;
gpucontext *ctx = gpudata_context(Xp->data);
size_t elsize;
int err;

if (X->typecode != GA_HALF &&
X->typecode != GA_FLOAT &&
X->typecode != GA_DOUBLE)
return GA_INVALID_ERROR;
return error_set(ctx->err, GA_INVALID_ERROR, "Data type not supported");

if (X->nd != 1 || Y->nd != 1 || Z->nd != 0 ||
X->typecode != Y->typecode || X->typecode != Z->typecode)
return GA_VALUE_ERROR;
return error_fmt(ctx->err, GA_VALUE_ERROR,
"Wrong number of dimensions: X->nd = %d (expected 1), Y->nd = %d (expected 1), Z->nd = %d (expected 0)",
X->nd, Y->nd, Z->nd);
n = X->dimensions[0];
if (!(X->flags & GA_ALIGNED) || !(Y->flags & GA_ALIGNED) ||
!(Z->flags & GA_ALIGNED))
return GA_UNALIGNED_ERROR;
if (X->dimensions[0] != Y->dimensions[0])
return GA_VALUE_ERROR;
return error_fmt(ctx->err, GA_VALUE_ERROR,
"Shape mismatch: X->dimensions[0] = %d != Y->dimensions[0] = %d",
X->dimensions[0], Y->dimensions[0]);

elsize = gpuarray_get_elsize(X->typecode);
if (X->strides[0] < 0) {
Expand All @@ -49,12 +55,11 @@ int GpuArray_rdot(GpuArray *X, GpuArray *Y,
else {
err = GpuArray_copy(&copyY, Y, GA_ANY_ORDER);
if (err != GA_NO_ERROR)
goto cleanup;
goto cleanup;
Yp = &copyY;
}
}

ctx = gpudata_context(Xp->data);
err = gpublas_setup(ctx);
if (err != GA_NO_ERROR)
goto cleanup;
Expand Down Expand Up @@ -138,7 +143,7 @@ int GpuArray_rgemv(cb_transpose transA, double alpha, GpuArray *A,
else {
err = GpuArray_copy(&copyA, A, GA_F_ORDER);
if (err != GA_NO_ERROR)
goto cleanup;
goto cleanup;
Ap = &copyA;
}
}
Expand All @@ -148,7 +153,7 @@ int GpuArray_rgemv(cb_transpose transA, double alpha, GpuArray *A,
else {
err = GpuArray_copy(&copyX, X, GA_ANY_ORDER);
if (err != GA_NO_ERROR)
goto cleanup;
goto cleanup;
Xp = &copyX;
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/gpuarray_buffer_cuda.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,6 +1103,10 @@ static int call_compiler(cuda_context *ctx, strb *src, strb *ptx, strb *log) {

if (err != NVRTC_SUCCESS) {
nvrtcDestroyProgram(&prog);
#ifdef DEBUG
strb_dump(src, stderr);
strb_dump(log, stderr);
#endif
return error_nvrtc(ctx->err, "nvrtcCompileProgram", err);
}

Expand Down