From e262e2d0f75c711707cacd1aeff2c396371b7a8c Mon Sep 17 00:00:00 2001 From: Oren <oren_segal@student.uml.edu> Date: Mon, 20 Jul 2015 22:17:34 -0400 Subject: [PATCH] Changed ConfigSettings to accept calls for all types. Note: Currently when using Altera OpenCL, CID only works one-way --- src/aparapi/com.amd.aparapi.jni/buildAndCopy.sh | 6 ++++++ .../com.amd.aparapi.jni/src/cpp/runKernel/ConfigSettings.h | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 src/aparapi/com.amd.aparapi.jni/buildAndCopy.sh diff --git a/src/aparapi/com.amd.aparapi.jni/buildAndCopy.sh b/src/aparapi/com.amd.aparapi.jni/buildAndCopy.sh new file mode 100644 index 00000000..0164a61b --- /dev/null +++ b/src/aparapi/com.amd.aparapi.jni/buildAndCopy.sh @@ -0,0 +1,6 @@ + +# $1 = ant build file name +# $2 = copy to folder name +# mkdir $2 +ant -f $1 +cp dist/libaparapi_x86_64.so dist.$2 diff --git a/src/aparapi/com.amd.aparapi.jni/src/cpp/runKernel/ConfigSettings.h b/src/aparapi/com.amd.aparapi.jni/src/cpp/runKernel/ConfigSettings.h index eb7063b1..daa94a62 100644 --- a/src/aparapi/com.amd.aparapi.jni/src/cpp/runKernel/ConfigSettings.h +++ b/src/aparapi/com.amd.aparapi.jni/src/cpp/runKernel/ConfigSettings.h @@ -33,7 +33,7 @@ // Altera platform specific /////////////////////////// #ifdef ALTERA_OPENCL - #define PLATFORM_FLOW_SUPPORT BINARY_FLOW + #define PLATFORM_FLOW_SUPPORT (SOURCE_FLOW | BINARY_FLOW | DEFAULT_FLOW) #define PLATFORM_DEFAULT_FLOW BINARY_FLOW #define BINARY_FILE_EXT ".aocx" #define BINARY_FILE_SEP '.' @@ -47,7 +47,7 @@ /////////////////////////// // All other platforms - set the default for other platforms /////////////////////////// - #define PLATFORM_FLOW_SUPPORT (BINARY_FLOW | SOURCE_FLOW) + #define PLATFORM_FLOW_SUPPORT (SOURCE_FLOW | BINARY_FLOW | DEFAULT_FLOW) #define PLATFORM_DEFAULT_FLOW SOURCE_FLOW #define BINARY_FILE_EXT ".bcl" #define BINARY_FILE_SEP '.' -- GitLab