Skip to content

Commit c12410a

Browse files
committed
Add arg size to kernel arg exceptions
1 parent 56cf958 commit c12410a

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

Core/src/main/velocity/com/nativelibs4java/opencl/CLException.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
#parse("main/Header.vm")
22
package com.nativelibs4java.opencl;
3+
4+
import static com.nativelibs4java.opencl.JavaCL.log;
35
import static com.nativelibs4java.opencl.library.OpenCLLibrary.*;
46
import static com.nativelibs4java.opencl.library.IOpenCLLibrary.*;
7+
58
import com.nativelibs4java.opencl.library.OpenCLLibrary;
69
import com.ochafik.util.string.StringUtils;
10+
11+
import org.bridj.*;
12+
713
import java.lang.annotation.Retention;
814
import java.lang.annotation.RetentionPolicy;
915
import java.util.*;
1016
import java.lang.reflect.*;
11-
import static com.nativelibs4java.opencl.JavaCL.log;
1217
import java.util.logging.Level;
1318
import java.util.logging.Logger;
1419

@@ -52,8 +57,11 @@ public String getMessage() {
5257
return message + logSuffix;
5358
}
5459

55-
void setKernelArg(CLKernel kernel, int argIndex) {
56-
message += " (kernel name = " + kernel.getFunctionName() + ", num args = " + kernel.getNumArgs() + ", arg index = " + argIndex;
60+
void setKernelArg(CLKernel kernel, int argIndex, long size, Pointer<?> ptr) {
61+
message += " (kernel name = " + kernel.getFunctionName();
62+
message += ", num args = " + kernel.getNumArgs();
63+
message += ", arg index = " + argIndex;
64+
message += ", arg size = " + size;
5765
CLProgram program = kernel.getProgram();
5866
if (program != null)
5967
message += ", source = <<<\n\t" + program.getSource().replaceAll("\n", "\n\t");

Core/src/main/velocity/com/nativelibs4java/opencl/CLKernel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ private void setKernelArg(int i, long size, Pointer<?> ptr) {
219219
try {
220220
error(CL.clSetKernelArg(getEntity(), i, size, getPeer(ptr)));
221221
} catch (CLTypedException ex) {
222-
ex.setKernelArg(this, i);
222+
ex.setKernelArg(this, i, size, ptr);
223223
throw ex;
224224
}
225225
}

0 commit comments

Comments
 (0)