From 877a6c56963817d63d6694b5a1b4438839cdcf8c Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Mon, 12 Dec 2016 20:57:25 -0500
Subject: [PATCH] Fixed numerous issues throughout the code, finally compiles.

---
 include/com_amd_aparapi_Config.h              |  15 ---
 ...m_amd_aparapi_Config_InstructionListener.h |  13 --
 include/com_amd_aparapi_Kernel.h              |  13 --
 include/com_amd_aparapi_Kernel_Constant.h     |  13 --
 .../com_amd_aparapi_Kernel_EXECUTION_MODE.h   |  13 --
 include/com_amd_aparapi_Kernel_Entry.h        |  13 --
 include/com_amd_aparapi_Kernel_FlowType.h     |  13 --
 include/com_amd_aparapi_Kernel_KernelState.h  |  13 --
 include/com_amd_aparapi_Kernel_Local.h        |  13 --
 .../com_amd_aparapi_Kernel_OpenCLDelegate.h   |  13 --
 .../com_amd_aparapi_Kernel_OpenCLMapping.h    |  13 --
 include/com_amd_aparapi_Range.h               |  17 ---
 include/com_amd_aparapi_device_Device.h       |  13 --
 include/com_amd_aparapi_device_Device_TYPE.h  |  13 --
 include/com_amd_aparapi_device_OpenCLDevice.h |  13 --
 ...api_device_OpenCLDevice_DeviceComparitor.h |  13 --
 ...arapi_device_OpenCLDevice_DeviceSelector.h |  13 --
 ...ice_OpenCLDevice_OpenCLInvocationHandler.h |  13 --
 .../com_amd_aparapi_internal_jni_ConfigJNI.h  |  13 --
 ...om_amd_aparapi_internal_jni_KernelArgJNI.h |  13 --
 ...amd_aparapi_internal_jni_KernelRunnerJNI.h | 127 ------------------
 .../com_amd_aparapi_internal_jni_OpenCLJNI.h  |  69 ----------
 .../com_amd_aparapi_internal_jni_RangeJNI.h   |  13 --
 ...amd_aparapi_internal_kernel_KernelRunner.h |  63 ---------
 ...rapi_internal_opencl_OpenCLArgDescriptor.h |  43 ------
 ...om_amd_aparapi_internal_opencl_OpenCLMem.h |  19 ---
 java                                          |   2 +-
 src/cpp/invoke/OpenCLJNI.cpp                  |   3 +-
 src/cpp/runKernel/Aparapi.cpp                 |   2 +-
 src/cpp/runKernel/ConfigSettings.h            |   8 +-
 30 files changed, 8 insertions(+), 607 deletions(-)
 delete mode 100644 include/com_amd_aparapi_Config.h
 delete mode 100644 include/com_amd_aparapi_Config_InstructionListener.h
 delete mode 100644 include/com_amd_aparapi_Kernel.h
 delete mode 100644 include/com_amd_aparapi_Kernel_Constant.h
 delete mode 100644 include/com_amd_aparapi_Kernel_EXECUTION_MODE.h
 delete mode 100644 include/com_amd_aparapi_Kernel_Entry.h
 delete mode 100644 include/com_amd_aparapi_Kernel_FlowType.h
 delete mode 100644 include/com_amd_aparapi_Kernel_KernelState.h
 delete mode 100644 include/com_amd_aparapi_Kernel_Local.h
 delete mode 100644 include/com_amd_aparapi_Kernel_OpenCLDelegate.h
 delete mode 100644 include/com_amd_aparapi_Kernel_OpenCLMapping.h
 delete mode 100644 include/com_amd_aparapi_Range.h
 delete mode 100644 include/com_amd_aparapi_device_Device.h
 delete mode 100644 include/com_amd_aparapi_device_Device_TYPE.h
 delete mode 100644 include/com_amd_aparapi_device_OpenCLDevice.h
 delete mode 100644 include/com_amd_aparapi_device_OpenCLDevice_DeviceComparitor.h
 delete mode 100644 include/com_amd_aparapi_device_OpenCLDevice_DeviceSelector.h
 delete mode 100644 include/com_amd_aparapi_device_OpenCLDevice_OpenCLInvocationHandler.h
 delete mode 100644 include/com_amd_aparapi_internal_jni_ConfigJNI.h
 delete mode 100644 include/com_amd_aparapi_internal_jni_KernelArgJNI.h
 delete mode 100644 include/com_amd_aparapi_internal_jni_KernelRunnerJNI.h
 delete mode 100644 include/com_amd_aparapi_internal_jni_OpenCLJNI.h
 delete mode 100644 include/com_amd_aparapi_internal_jni_RangeJNI.h
 delete mode 100644 include/com_amd_aparapi_internal_kernel_KernelRunner.h
 delete mode 100644 include/com_amd_aparapi_internal_opencl_OpenCLArgDescriptor.h
 delete mode 100644 include/com_amd_aparapi_internal_opencl_OpenCLMem.h

diff --git a/include/com_amd_aparapi_Config.h b/include/com_amd_aparapi_Config.h
deleted file mode 100644
index 18aa84e..0000000
--- a/include/com_amd_aparapi_Config.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_Config */
-
-#ifndef _Included_com_amd_aparapi_Config
-#define _Included_com_amd_aparapi_Config
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef com_amd_aparapi_Config_enableGETSTATIC
-#define com_amd_aparapi_Config_enableGETSTATIC 1L
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_Config_InstructionListener.h b/include/com_amd_aparapi_Config_InstructionListener.h
deleted file mode 100644
index 3e21898..0000000
--- a/include/com_amd_aparapi_Config_InstructionListener.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_Config_InstructionListener */
-
-#ifndef _Included_com_amd_aparapi_Config_InstructionListener
-#define _Included_com_amd_aparapi_Config_InstructionListener
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_Kernel.h b/include/com_amd_aparapi_Kernel.h
deleted file mode 100644
index fe91fff..0000000
--- a/include/com_amd_aparapi_Kernel.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_Kernel */
-
-#ifndef _Included_com_amd_aparapi_Kernel
-#define _Included_com_amd_aparapi_Kernel
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_Kernel_Constant.h b/include/com_amd_aparapi_Kernel_Constant.h
deleted file mode 100644
index 3117781..0000000
--- a/include/com_amd_aparapi_Kernel_Constant.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_Kernel_Constant */
-
-#ifndef _Included_com_amd_aparapi_Kernel_Constant
-#define _Included_com_amd_aparapi_Kernel_Constant
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_Kernel_EXECUTION_MODE.h b/include/com_amd_aparapi_Kernel_EXECUTION_MODE.h
deleted file mode 100644
index 050bf5b..0000000
--- a/include/com_amd_aparapi_Kernel_EXECUTION_MODE.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_Kernel_EXECUTION_MODE */
-
-#ifndef _Included_com_amd_aparapi_Kernel_EXECUTION_MODE
-#define _Included_com_amd_aparapi_Kernel_EXECUTION_MODE
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_Kernel_Entry.h b/include/com_amd_aparapi_Kernel_Entry.h
deleted file mode 100644
index ebdade3..0000000
--- a/include/com_amd_aparapi_Kernel_Entry.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_Kernel_Entry */
-
-#ifndef _Included_com_amd_aparapi_Kernel_Entry
-#define _Included_com_amd_aparapi_Kernel_Entry
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_Kernel_FlowType.h b/include/com_amd_aparapi_Kernel_FlowType.h
deleted file mode 100644
index 30b2ec5..0000000
--- a/include/com_amd_aparapi_Kernel_FlowType.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_Kernel_FlowType */
-
-#ifndef _Included_com_amd_aparapi_Kernel_FlowType
-#define _Included_com_amd_aparapi_Kernel_FlowType
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_Kernel_KernelState.h b/include/com_amd_aparapi_Kernel_KernelState.h
deleted file mode 100644
index 8dcb99c..0000000
--- a/include/com_amd_aparapi_Kernel_KernelState.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_Kernel_KernelState */
-
-#ifndef _Included_com_amd_aparapi_Kernel_KernelState
-#define _Included_com_amd_aparapi_Kernel_KernelState
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_Kernel_Local.h b/include/com_amd_aparapi_Kernel_Local.h
deleted file mode 100644
index 0d09bfd..0000000
--- a/include/com_amd_aparapi_Kernel_Local.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_Kernel_Local */
-
-#ifndef _Included_com_amd_aparapi_Kernel_Local
-#define _Included_com_amd_aparapi_Kernel_Local
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_Kernel_OpenCLDelegate.h b/include/com_amd_aparapi_Kernel_OpenCLDelegate.h
deleted file mode 100644
index 0e71b78..0000000
--- a/include/com_amd_aparapi_Kernel_OpenCLDelegate.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_Kernel_OpenCLDelegate */
-
-#ifndef _Included_com_amd_aparapi_Kernel_OpenCLDelegate
-#define _Included_com_amd_aparapi_Kernel_OpenCLDelegate
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_Kernel_OpenCLMapping.h b/include/com_amd_aparapi_Kernel_OpenCLMapping.h
deleted file mode 100644
index 6864e49..0000000
--- a/include/com_amd_aparapi_Kernel_OpenCLMapping.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_Kernel_OpenCLMapping */
-
-#ifndef _Included_com_amd_aparapi_Kernel_OpenCLMapping
-#define _Included_com_amd_aparapi_Kernel_OpenCLMapping
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_Range.h b/include/com_amd_aparapi_Range.h
deleted file mode 100644
index 5a4f770..0000000
--- a/include/com_amd_aparapi_Range.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_Range */
-
-#ifndef _Included_com_amd_aparapi_Range
-#define _Included_com_amd_aparapi_Range
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef com_amd_aparapi_Range_THREADS_PER_CORE
-#define com_amd_aparapi_Range_THREADS_PER_CORE 16L
-#undef com_amd_aparapi_Range_MAX_OPENCL_GROUP_SIZE
-#define com_amd_aparapi_Range_MAX_OPENCL_GROUP_SIZE 1024L
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_device_Device.h b/include/com_amd_aparapi_device_Device.h
deleted file mode 100644
index 950d817..0000000
--- a/include/com_amd_aparapi_device_Device.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_device_Device */
-
-#ifndef _Included_com_amd_aparapi_device_Device
-#define _Included_com_amd_aparapi_device_Device
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_device_Device_TYPE.h b/include/com_amd_aparapi_device_Device_TYPE.h
deleted file mode 100644
index b6ffda5..0000000
--- a/include/com_amd_aparapi_device_Device_TYPE.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_device_Device_TYPE */
-
-#ifndef _Included_com_amd_aparapi_device_Device_TYPE
-#define _Included_com_amd_aparapi_device_Device_TYPE
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_device_OpenCLDevice.h b/include/com_amd_aparapi_device_OpenCLDevice.h
deleted file mode 100644
index 6aee994..0000000
--- a/include/com_amd_aparapi_device_OpenCLDevice.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_device_OpenCLDevice */
-
-#ifndef _Included_com_amd_aparapi_device_OpenCLDevice
-#define _Included_com_amd_aparapi_device_OpenCLDevice
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_device_OpenCLDevice_DeviceComparitor.h b/include/com_amd_aparapi_device_OpenCLDevice_DeviceComparitor.h
deleted file mode 100644
index 96cc3a4..0000000
--- a/include/com_amd_aparapi_device_OpenCLDevice_DeviceComparitor.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_device_OpenCLDevice_DeviceComparitor */
-
-#ifndef _Included_com_amd_aparapi_device_OpenCLDevice_DeviceComparitor
-#define _Included_com_amd_aparapi_device_OpenCLDevice_DeviceComparitor
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_device_OpenCLDevice_DeviceSelector.h b/include/com_amd_aparapi_device_OpenCLDevice_DeviceSelector.h
deleted file mode 100644
index eeb9a58..0000000
--- a/include/com_amd_aparapi_device_OpenCLDevice_DeviceSelector.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_device_OpenCLDevice_DeviceSelector */
-
-#ifndef _Included_com_amd_aparapi_device_OpenCLDevice_DeviceSelector
-#define _Included_com_amd_aparapi_device_OpenCLDevice_DeviceSelector
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_device_OpenCLDevice_OpenCLInvocationHandler.h b/include/com_amd_aparapi_device_OpenCLDevice_OpenCLInvocationHandler.h
deleted file mode 100644
index 1dfb655..0000000
--- a/include/com_amd_aparapi_device_OpenCLDevice_OpenCLInvocationHandler.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_device_OpenCLDevice_OpenCLInvocationHandler */
-
-#ifndef _Included_com_amd_aparapi_device_OpenCLDevice_OpenCLInvocationHandler
-#define _Included_com_amd_aparapi_device_OpenCLDevice_OpenCLInvocationHandler
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_internal_jni_ConfigJNI.h b/include/com_amd_aparapi_internal_jni_ConfigJNI.h
deleted file mode 100644
index 7cf6075..0000000
--- a/include/com_amd_aparapi_internal_jni_ConfigJNI.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_internal_jni_ConfigJNI */
-
-#ifndef _Included_com_amd_aparapi_internal_jni_ConfigJNI
-#define _Included_com_amd_aparapi_internal_jni_ConfigJNI
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_internal_jni_KernelArgJNI.h b/include/com_amd_aparapi_internal_jni_KernelArgJNI.h
deleted file mode 100644
index 4e0af55..0000000
--- a/include/com_amd_aparapi_internal_jni_KernelArgJNI.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_internal_jni_KernelArgJNI */
-
-#ifndef _Included_com_amd_aparapi_internal_jni_KernelArgJNI
-#define _Included_com_amd_aparapi_internal_jni_KernelArgJNI
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_internal_jni_KernelRunnerJNI.h b/include/com_amd_aparapi_internal_jni_KernelRunnerJNI.h
deleted file mode 100644
index 6791475..0000000
--- a/include/com_amd_aparapi_internal_jni_KernelRunnerJNI.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_internal_jni_KernelRunnerJNI */
-
-#ifndef _Included_com_amd_aparapi_internal_jni_KernelRunnerJNI
-#define _Included_com_amd_aparapi_internal_jni_KernelRunnerJNI
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_BOOLEAN
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_BOOLEAN 1L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_BYTE
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_BYTE 2L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_FLOAT
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_FLOAT 4L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_INT
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_INT 8L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_DOUBLE
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_DOUBLE 16L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_LONG
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_LONG 32L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_SHORT
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_SHORT 64L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_ARRAY
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_ARRAY 128L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_PRIMITIVE
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_PRIMITIVE 256L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_READ
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_READ 512L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_WRITE
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_WRITE 1024L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_LOCAL
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_LOCAL 2048L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_GLOBAL
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_GLOBAL 4096L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_CONSTANT
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_CONSTANT 8192L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_ARRAYLENGTH
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_ARRAYLENGTH 16384L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_APARAPI_BUFFER
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_APARAPI_BUFFER 32768L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_EXPLICIT
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_EXPLICIT 65536L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_EXPLICIT_WRITE
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_EXPLICIT_WRITE 131072L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_OBJ_ARRAY_STRUCT
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_OBJ_ARRAY_STRUCT 262144L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_CHAR
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_CHAR 2097152L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_STATIC
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_ARG_STATIC 4194304L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_JNI_FLAG_USE_GPU
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_JNI_FLAG_USE_GPU 4L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_JNI_FLAG_SOURCE_FLOW
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_JNI_FLAG_SOURCE_FLOW 1L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_JNI_FLAG_BINARY_FLOW
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_JNI_FLAG_BINARY_FLOW 2L
-#undef com_amd_aparapi_internal_jni_KernelRunnerJNI_JNI_FLAG_DEFAULT_FLOW
-#define com_amd_aparapi_internal_jni_KernelRunnerJNI_JNI_FLAG_DEFAULT_FLOW 4L
-/*
- * Class:     com_amd_aparapi_internal_jni_KernelRunnerJNI
- * Method:    initJNI
- * Signature: (Lcom/amd/aparapi/Kernel;Lcom/amd/aparapi/device/OpenCLDevice;I)J
- */
-JNIEXPORT jlong JNICALL Java_com_amd_aparapi_internal_jni_KernelRunnerJNI_initJNI
-  (JNIEnv *, jobject, jobject, jobject, jint);
-
-/*
- * Class:     com_amd_aparapi_internal_jni_KernelRunnerJNI
- * Method:    getJNI
- * Signature: (JLjava/lang/Object;)I
- */
-JNIEXPORT jint JNICALL Java_com_amd_aparapi_internal_jni_KernelRunnerJNI_getJNI
-  (JNIEnv *, jobject, jlong, jobject);
-
-/*
- * Class:     com_amd_aparapi_internal_jni_KernelRunnerJNI
- * Method:    buildProgramJNI
- * Signature: (JLjava/lang/String;I)J
- */
-JNIEXPORT jlong JNICALL Java_com_amd_aparapi_internal_jni_KernelRunnerJNI_buildProgramJNI
-  (JNIEnv *, jobject, jlong, jstring, jint);
-
-/*
- * Class:     com_amd_aparapi_internal_jni_KernelRunnerJNI
- * Method:    setArgsJNI
- * Signature: (J[Lcom/amd/aparapi/internal/jni/KernelArgJNI;I)I
- */
-JNIEXPORT jint JNICALL Java_com_amd_aparapi_internal_jni_KernelRunnerJNI_setArgsJNI
-  (JNIEnv *, jobject, jlong, jobjectArray, jint);
-
-/*
- * Class:     com_amd_aparapi_internal_jni_KernelRunnerJNI
- * Method:    runKernelJNI
- * Signature: (JLcom/amd/aparapi/Range;ZI)I
- */
-JNIEXPORT jint JNICALL Java_com_amd_aparapi_internal_jni_KernelRunnerJNI_runKernelJNI
-  (JNIEnv *, jobject, jlong, jobject, jboolean, jint);
-
-/*
- * Class:     com_amd_aparapi_internal_jni_KernelRunnerJNI
- * Method:    disposeJNI
- * Signature: (J)I
- */
-JNIEXPORT jint JNICALL Java_com_amd_aparapi_internal_jni_KernelRunnerJNI_disposeJNI
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_amd_aparapi_internal_jni_KernelRunnerJNI
- * Method:    getExtensionsJNI
- * Signature: (J)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_com_amd_aparapi_internal_jni_KernelRunnerJNI_getExtensionsJNI
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_amd_aparapi_internal_jni_KernelRunnerJNI
- * Method:    getProfileInfoJNI
- * Signature: (J)Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_com_amd_aparapi_internal_jni_KernelRunnerJNI_getProfileInfoJNI
-  (JNIEnv *, jobject, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_internal_jni_OpenCLJNI.h b/include/com_amd_aparapi_internal_jni_OpenCLJNI.h
deleted file mode 100644
index 76a8e85..0000000
--- a/include/com_amd_aparapi_internal_jni_OpenCLJNI.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_internal_jni_OpenCLJNI */
-
-#ifndef _Included_com_amd_aparapi_internal_jni_OpenCLJNI
-#define _Included_com_amd_aparapi_internal_jni_OpenCLJNI
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     com_amd_aparapi_internal_jni_OpenCLJNI
- * Method:    getPlatforms
- * Signature: ()Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_com_amd_aparapi_internal_jni_OpenCLJNI_getPlatforms
-  (JNIEnv *, jobject);
-
-/*
- * Class:     com_amd_aparapi_internal_jni_OpenCLJNI
- * Method:    createProgram
- * Signature: (Lcom/amd/aparapi/device/OpenCLDevice;Ljava/lang/String;)Lcom/amd/aparapi/internal/opencl/OpenCLProgram;
- */
-JNIEXPORT jobject JNICALL Java_com_amd_aparapi_internal_jni_OpenCLJNI_createProgram
-  (JNIEnv *, jobject, jobject, jstring);
-
-/*
- * Class:     com_amd_aparapi_internal_jni_OpenCLJNI
- * Method:    createKernelJNI
- * Signature: (Lcom/amd/aparapi/internal/opencl/OpenCLProgram;Ljava/lang/String;[Lcom/amd/aparapi/internal/opencl/OpenCLArgDescriptor;)Lcom/amd/aparapi/internal/opencl/OpenCLKernel;
- */
-JNIEXPORT jobject JNICALL Java_com_amd_aparapi_internal_jni_OpenCLJNI_createKernelJNI
-  (JNIEnv *, jobject, jobject, jstring, jobjectArray);
-
-/*
- * Class:     com_amd_aparapi_internal_jni_OpenCLJNI
- * Method:    invoke
- * Signature: (Lcom/amd/aparapi/internal/opencl/OpenCLKernel;[Ljava/lang/Object;)V
- */
-JNIEXPORT void JNICALL Java_com_amd_aparapi_internal_jni_OpenCLJNI_invoke
-  (JNIEnv *, jobject, jobject, jobjectArray);
-
-/*
- * Class:     com_amd_aparapi_internal_jni_OpenCLJNI
- * Method:    remap
- * Signature: (Lcom/amd/aparapi/internal/opencl/OpenCLProgram;Lcom/amd/aparapi/internal/opencl/OpenCLMem;J)V
- */
-JNIEXPORT void JNICALL Java_com_amd_aparapi_internal_jni_OpenCLJNI_remap
-  (JNIEnv *, jobject, jobject, jobject, jlong);
-
-/*
- * Class:     com_amd_aparapi_internal_jni_OpenCLJNI
- * Method:    getBytes
- * Signature: (Ljava/lang/String;)[B
- */
-JNIEXPORT jbyteArray JNICALL Java_com_amd_aparapi_internal_jni_OpenCLJNI_getBytes
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     com_amd_aparapi_internal_jni_OpenCLJNI
- * Method:    getMem
- * Signature: (Lcom/amd/aparapi/internal/opencl/OpenCLProgram;Lcom/amd/aparapi/internal/opencl/OpenCLMem;)V
- */
-JNIEXPORT void JNICALL Java_com_amd_aparapi_internal_jni_OpenCLJNI_getMem
-  (JNIEnv *, jobject, jobject, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_internal_jni_RangeJNI.h b/include/com_amd_aparapi_internal_jni_RangeJNI.h
deleted file mode 100644
index 5802d94..0000000
--- a/include/com_amd_aparapi_internal_jni_RangeJNI.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_internal_jni_RangeJNI */
-
-#ifndef _Included_com_amd_aparapi_internal_jni_RangeJNI
-#define _Included_com_amd_aparapi_internal_jni_RangeJNI
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_internal_kernel_KernelRunner.h b/include/com_amd_aparapi_internal_kernel_KernelRunner.h
deleted file mode 100644
index 2819cc7..0000000
--- a/include/com_amd_aparapi_internal_kernel_KernelRunner.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_internal_kernel_KernelRunner */
-
-#ifndef _Included_com_amd_aparapi_internal_kernel_KernelRunner
-#define _Included_com_amd_aparapi_internal_kernel_KernelRunner
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef com_amd_aparapi_internal_kernel_KernelRunner_ARG_BOOLEAN
-#define com_amd_aparapi_internal_kernel_KernelRunner_ARG_BOOLEAN 1L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_ARG_BYTE
-#define com_amd_aparapi_internal_kernel_KernelRunner_ARG_BYTE 2L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_ARG_FLOAT
-#define com_amd_aparapi_internal_kernel_KernelRunner_ARG_FLOAT 4L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_ARG_INT
-#define com_amd_aparapi_internal_kernel_KernelRunner_ARG_INT 8L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_ARG_DOUBLE
-#define com_amd_aparapi_internal_kernel_KernelRunner_ARG_DOUBLE 16L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_ARG_LONG
-#define com_amd_aparapi_internal_kernel_KernelRunner_ARG_LONG 32L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_ARG_SHORT
-#define com_amd_aparapi_internal_kernel_KernelRunner_ARG_SHORT 64L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_ARG_ARRAY
-#define com_amd_aparapi_internal_kernel_KernelRunner_ARG_ARRAY 128L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_ARG_PRIMITIVE
-#define com_amd_aparapi_internal_kernel_KernelRunner_ARG_PRIMITIVE 256L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_ARG_READ
-#define com_amd_aparapi_internal_kernel_KernelRunner_ARG_READ 512L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_ARG_WRITE
-#define com_amd_aparapi_internal_kernel_KernelRunner_ARG_WRITE 1024L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_ARG_LOCAL
-#define com_amd_aparapi_internal_kernel_KernelRunner_ARG_LOCAL 2048L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_ARG_GLOBAL
-#define com_amd_aparapi_internal_kernel_KernelRunner_ARG_GLOBAL 4096L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_ARG_CONSTANT
-#define com_amd_aparapi_internal_kernel_KernelRunner_ARG_CONSTANT 8192L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_ARG_ARRAYLENGTH
-#define com_amd_aparapi_internal_kernel_KernelRunner_ARG_ARRAYLENGTH 16384L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_ARG_APARAPI_BUFFER
-#define com_amd_aparapi_internal_kernel_KernelRunner_ARG_APARAPI_BUFFER 32768L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_ARG_EXPLICIT
-#define com_amd_aparapi_internal_kernel_KernelRunner_ARG_EXPLICIT 65536L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_ARG_EXPLICIT_WRITE
-#define com_amd_aparapi_internal_kernel_KernelRunner_ARG_EXPLICIT_WRITE 131072L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_ARG_OBJ_ARRAY_STRUCT
-#define com_amd_aparapi_internal_kernel_KernelRunner_ARG_OBJ_ARRAY_STRUCT 262144L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_ARG_CHAR
-#define com_amd_aparapi_internal_kernel_KernelRunner_ARG_CHAR 2097152L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_ARG_STATIC
-#define com_amd_aparapi_internal_kernel_KernelRunner_ARG_STATIC 4194304L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_JNI_FLAG_USE_GPU
-#define com_amd_aparapi_internal_kernel_KernelRunner_JNI_FLAG_USE_GPU 4L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_JNI_FLAG_SOURCE_FLOW
-#define com_amd_aparapi_internal_kernel_KernelRunner_JNI_FLAG_SOURCE_FLOW 1L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_JNI_FLAG_BINARY_FLOW
-#define com_amd_aparapi_internal_kernel_KernelRunner_JNI_FLAG_BINARY_FLOW 2L
-#undef com_amd_aparapi_internal_kernel_KernelRunner_JNI_FLAG_DEFAULT_FLOW
-#define com_amd_aparapi_internal_kernel_KernelRunner_JNI_FLAG_DEFAULT_FLOW 4L
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_internal_opencl_OpenCLArgDescriptor.h b/include/com_amd_aparapi_internal_opencl_OpenCLArgDescriptor.h
deleted file mode 100644
index 1e608d6..0000000
--- a/include/com_amd_aparapi_internal_opencl_OpenCLArgDescriptor.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_internal_opencl_OpenCLArgDescriptor */
-
-#ifndef _Included_com_amd_aparapi_internal_opencl_OpenCLArgDescriptor
-#define _Included_com_amd_aparapi_internal_opencl_OpenCLArgDescriptor
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_BYTE_BIT
-#define com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_BYTE_BIT 1L
-#undef com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_SHORT_BIT
-#define com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_SHORT_BIT 2L
-#undef com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_INT_BIT
-#define com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_INT_BIT 4L
-#undef com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_FLOAT_BIT
-#define com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_FLOAT_BIT 8L
-#undef com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_LONG_BIT
-#define com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_LONG_BIT 16L
-#undef com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_DOUBLE_BIT
-#define com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_DOUBLE_BIT 32L
-#undef com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_ARRAY_BIT
-#define com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_ARRAY_BIT 64L
-#undef com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_PRIMITIVE_BIT
-#define com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_PRIMITIVE_BIT 128L
-#undef com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_GLOBAL_BIT
-#define com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_GLOBAL_BIT 256L
-#undef com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_LOCAL_BIT
-#define com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_LOCAL_BIT 512L
-#undef com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_CONST_BIT
-#define com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_CONST_BIT 1024L
-#undef com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_READONLY_BIT
-#define com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_READONLY_BIT 2048L
-#undef com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_WRITEONLY_BIT
-#define com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_WRITEONLY_BIT 4096L
-#undef com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_READWRITE_BIT
-#define com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_READWRITE_BIT 8192L
-#undef com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_ISARG_BIT
-#define com_amd_aparapi_internal_opencl_OpenCLArgDescriptor_ARG_ISARG_BIT 16384L
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/com_amd_aparapi_internal_opencl_OpenCLMem.h b/include/com_amd_aparapi_internal_opencl_OpenCLMem.h
deleted file mode 100644
index 2a67836..0000000
--- a/include/com_amd_aparapi_internal_opencl_OpenCLMem.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_amd_aparapi_internal_opencl_OpenCLMem */
-
-#ifndef _Included_com_amd_aparapi_internal_opencl_OpenCLMem
-#define _Included_com_amd_aparapi_internal_opencl_OpenCLMem
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef com_amd_aparapi_internal_opencl_OpenCLMem_MEM_DIRTY_BIT
-#define com_amd_aparapi_internal_opencl_OpenCLMem_MEM_DIRTY_BIT 32768L
-#undef com_amd_aparapi_internal_opencl_OpenCLMem_MEM_COPY_BIT
-#define com_amd_aparapi_internal_opencl_OpenCLMem_MEM_COPY_BIT 65536L
-#undef com_amd_aparapi_internal_opencl_OpenCLMem_MEM_ENQUEUED_BIT
-#define com_amd_aparapi_internal_opencl_OpenCLMem_MEM_ENQUEUED_BIT 131072L
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/java b/java
index b742d6d..3c21e71 160000
--- a/java
+++ b/java
@@ -1 +1 @@
-Subproject commit b742d6deedbf7434af61eb5155cdfc021a5570ff
+Subproject commit 3c21e711ee109abd42947d068a290c99627f6118
diff --git a/src/cpp/invoke/OpenCLJNI.cpp b/src/cpp/invoke/OpenCLJNI.cpp
index 6976bb1..a08a785 100644
--- a/src/cpp/invoke/OpenCLJNI.cpp
+++ b/src/cpp/invoke/OpenCLJNI.cpp
@@ -106,7 +106,7 @@ JNI_JAVA(jobject, OpenCLJNI, createProgram)
 
 
       jstring log=NULL;
-      cl_program program = CLHelper::compile(jenv, context, 1, &deviceId, &source, &log, &status);
+      cl_program program = CLHelper::compile(jenv, context, 1, &deviceId, source, &log, &status);
       cl_command_queue queue = NULL;
       if(status == CL_SUCCESS) {
          cl_command_queue_properties queue_props = CL_QUEUE_PROFILING_ENABLE;
@@ -563,3 +563,4 @@ JNI_JAVA(jobject, OpenCLJNI, getPlatforms)
 
       return (platformListInstance);
    }
+}
diff --git a/src/cpp/runKernel/Aparapi.cpp b/src/cpp/runKernel/Aparapi.cpp
index ea7a33f..0fa51f5 100644
--- a/src/cpp/runKernel/Aparapi.cpp
+++ b/src/cpp/runKernel/Aparapi.cpp
@@ -1341,7 +1341,7 @@ inline void verifyFlow(JNIContext* jniContext, jint &buildFlags)
 }
 
 JNI_JAVA(jlong, KernelRunnerJNI, buildProgramJNI)
-   (JNIEnv *jenv, jobject jobj, jlong jniContextHandle, jstring source, jstring binaryKey, jint buildFlags) {
+   (JNIEnv *jenv, jobject jobj, jlong jniContextHandle, jstring source, jint buildFlags) {
       JNIContext* jniContext = JNIContext::getJNIContext(jniContextHandle);
       if (jniContext == NULL){
          return 0;
diff --git a/src/cpp/runKernel/ConfigSettings.h b/src/cpp/runKernel/ConfigSettings.h
index 2c87a67..792287b 100644
--- a/src/cpp/runKernel/ConfigSettings.h
+++ b/src/cpp/runKernel/ConfigSettings.h
@@ -12,7 +12,7 @@
 #include <memory>
 
 // use values from JNI config
-#include "com_amd_aparapi_internal_jni_KernelRunnerJNI.h"
+#include "com_aparapi_internal_jni_KernelRunnerJNI.h"
 
 // auto output kernel.cl file
 #define OUTPUT_OCL_FILE
@@ -23,9 +23,9 @@
 ///////////////////////////
 // help determine if platform supports source/binary flows
 ///////////////////////////
-#define SOURCE_FLOW   com_amd_aparapi_internal_jni_KernelRunnerJNI_JNI_FLAG_SOURCE_FLOW
-#define BINARY_FLOW   com_amd_aparapi_internal_jni_KernelRunnerJNI_JNI_FLAG_BINARY_FLOW
-#define DEFAULT_FLOW  com_amd_aparapi_internal_jni_KernelRunnerJNI_JNI_FLAG_DEFAULT_FLOW
+#define SOURCE_FLOW   com_aparapi_internal_jni_KernelRunnerJNI_JNI_FLAG_SOURCE_FLOW
+#define BINARY_FLOW   com_aparapi_internal_jni_KernelRunnerJNI_JNI_FLAG_BINARY_FLOW
+#define DEFAULT_FLOW  com_aparapi_internal_jni_KernelRunnerJNI_JNI_FLAG_DEFAULT_FLOW
 ///////////////////////////
 
 //#define FILE_EXT_LENGTH 8
-- 
GitLab