Commit aaf0ae64 authored by Ryan-LaMothe-PNNL's avatar Ryan-LaMothe-PNNL

Merge pull request #19 from ekasitk/master

Correct the execution condition for simple array of objects
parents b793315e 6b4fc47d
......@@ -190,7 +190,7 @@ public class KernelManager {
devices.addAll(gpus);
break;
case CPU:
devices.add(cpus.get(0));
devices.addAll(cpus);
break;
case JTP:
devices.add(JavaDevice.THREAD_POOL);
......
......@@ -1371,11 +1371,12 @@ public class KernelRunner extends KernelRunnerJNI{
// args[i].type |= ARG_GLOBAL;
if (type.getName().startsWith("[L")) {
args[i].setArray(null); // will get updated in updateKernelArrayRefs
args[i].setType(args[i].getType()
| (ARG_OBJ_ARRAY_STRUCT | ARG_WRITE | ARG_READ | ARG_APARAPI_BUFFER));
| (ARG_ARRAY | ARG_OBJ_ARRAY_STRUCT | ARG_WRITE | ARG_READ));
if (logger.isLoggable(Level.FINE)) {
logger.fine("tagging " + args[i].getName() + " as (ARG_OBJ_ARRAY_STRUCT | ARG_WRITE | ARG_READ)");
logger.fine("tagging " + args[i].getName() + " as (ARG_ARRAY | ARG_OBJ_ARRAY_STRUCT | ARG_WRITE | ARG_READ)");
}
} else if (type.getName().startsWith("[[")) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment