summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bien <[email protected]>2010-03-01 02:37:16 +0100
committerMichael Bien <[email protected]>2010-03-01 02:37:16 +0100
commit85a5c5f455aec2062f12d1a4c0a1a3c10beeefb7 (patch)
tree659759b91f9b0c7992dd6dfedbd45fe385d331cb
parent04fac379b2bb5876b21d047294bd3e029e6ebe3c (diff)
moved bitonic sort into seperate package.
-rw-r--r--nbproject/configs/BitonicSort.properties2
-rw-r--r--src/com/mbien/opencl/demos/bitonicsort/BitonicSort.cl (renamed from src/com/mbien/opencl/demos/sort/BitonicSort.cl)0
-rw-r--r--src/com/mbien/opencl/demos/bitonicsort/BitonicSort.java (renamed from src/com/mbien/opencl/demos/sort/BitonicSort.java)6
3 files changed, 4 insertions, 4 deletions
diff --git a/nbproject/configs/BitonicSort.properties b/nbproject/configs/BitonicSort.properties
index 15f2337..afddef4 100644
--- a/nbproject/configs/BitonicSort.properties
+++ b/nbproject/configs/BitonicSort.properties
@@ -1 +1 @@
-main.class=com.mbien.opencl.demos.sort.BitonicSort
+main.class=com.mbien.opencl.demos.bitonicsort.BitonicSort
diff --git a/src/com/mbien/opencl/demos/sort/BitonicSort.cl b/src/com/mbien/opencl/demos/bitonicsort/BitonicSort.cl
index a8d0e1d..a8d0e1d 100644
--- a/src/com/mbien/opencl/demos/sort/BitonicSort.cl
+++ b/src/com/mbien/opencl/demos/bitonicsort/BitonicSort.cl
diff --git a/src/com/mbien/opencl/demos/sort/BitonicSort.java b/src/com/mbien/opencl/demos/bitonicsort/BitonicSort.java
index 207ad1e..ed5b32e 100644
--- a/src/com/mbien/opencl/demos/sort/BitonicSort.java
+++ b/src/com/mbien/opencl/demos/bitonicsort/BitonicSort.java
@@ -1,7 +1,7 @@
/*
* 18:42 Saturday, February 27 2010
*/
-package com.mbien.opencl.demos.sort;
+package com.mbien.opencl.demos.bitonicsort;
import com.mbien.opencl.CLBuffer;
import com.mbien.opencl.CLCommandQueue;
@@ -37,7 +37,7 @@ public class BitonicSort {
final int sortDir = 1;
final int elements = 1048576;
- final int maxvalue = 100000;
+ final int maxvalue = 1000000;
out.println("Initializing OpenCL...");
@@ -76,7 +76,7 @@ public class BitonicSort {
out.println(currentTimeMillis() - time+"ms");
IntBuffer keys = keyBuffer.getBuffer();
- printSnapshot(keys, 10);
+ printSnapshot(keys, 20);
checkIfSorted(keys);
out.println("\nTEST PASSED");