Skip to content
Snippets Groups Projects
Commit 22a3c40c authored by Gary Frost's avatar Gary Frost
Browse files

Added toString patch fixing issue #121

parent 3615a430
No related branches found
No related tags found
No related merge requests found
...@@ -274,10 +274,10 @@ public class Range extends RangeJNI{ ...@@ -274,10 +274,10 @@ public class Range extends RangeJNI{
* Note that for this range to be valid <code>_globalWidth > 0 && _globalHeight >0 _globalDepth >0 && _localWidth>0 && _localHeight>0 && _localDepth>0 && _localWidth*_localHeight*_localDepth < MAX_GROUP_SIZE && _globalWidth%_localWidth==0 && _globalHeight%_localHeight==0 && _globalDepth%_localDepth==0</code>. * Note that for this range to be valid <code>_globalWidth > 0 && _globalHeight >0 _globalDepth >0 && _localWidth>0 && _localHeight>0 && _localDepth>0 && _localWidth*_localHeight*_localDepth < MAX_GROUP_SIZE && _globalWidth%_localWidth==0 && _globalHeight%_localHeight==0 && _globalDepth%_localDepth==0</code>.
* *
* @param _globalWidth the width of the 3D grid we wish to process * @param _globalWidth the width of the 3D grid we wish to process
* @param _globalHieght the height of the 3D grid we wish to process * @param _globalHeight the height of the 3D grid we wish to process
* @param _globalDepth the depth of the 3D grid we wish to process * @param _globalDepth the depth of the 3D grid we wish to process
* @param _localWidth the width of the 3D group we wish to process * @param _localWidth the width of the 3D group we wish to process
* @param _localHieght the height of the 3D group we wish to process * @param _localHeight the height of the 3D group we wish to process
* @param _localDepth the depth of the 3D group we wish to process * @param _localDepth the depth of the 3D group we wish to process
* @return * @return
*/ */
...@@ -407,8 +407,8 @@ public class Range extends RangeJNI{ ...@@ -407,8 +407,8 @@ public class Range extends RangeJNI{
+ localSize_0 + "x" + localSize_1 + ")"); + localSize_0 + "x" + localSize_1 + ")");
break; break;
case 3: case 3:
sb.append("3D(global:" + globalSize_0 + "x" + globalSize_1 + "x" + globalSize_2 + " local:" sb.append("3D(global:" + globalSize_0 + "x" + globalSize_1 + "x" + globalSize_2 + " local:"
+ (localIsDerived ? "(derived)" : "") + localSize_0 + "x" + localSize_1 + "x" + localSize_0 + ")"); + (localIsDerived ? "(derived)" : "") + localSize_0 + "x" + localSize_1 + "x" + localSize_2 + ")");
break; break;
} }
......
...@@ -171,7 +171,7 @@ public class OpenCLDevice extends Device{ ...@@ -171,7 +171,7 @@ public class OpenCLDevice extends Device{
} else if (method.getName().equals("begin")) { } else if (method.getName().equals("begin")) {
System.out.println("begin not implemented"); System.out.println("begin not implemented");
} else if (method.getName().equals("dispose")) { } else if (method.getName().equals("dispose")) {
System.out.println("dispose"); // System.out.println("dispose");
for (OpenCLKernel k:map.values()){ for (OpenCLKernel k:map.values()){
k.dispose(); k.dispose();
} }
......
...@@ -66,11 +66,11 @@ public class SquareExample{ ...@@ -66,11 +66,11 @@ public class SquareExample{
System.out.println(l+" "+in[i] + " " + squares[i]); System.out.println(l+" "+in[i] + " " + squares[i]);
} }
// squarer.square(range, squares, quads); squarer.square(range, squares, quads);
// for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
// System.out.println(l+" "+ in[i] + " " + squares[i] + " " + quads[i]); System.out.println(l+" "+ in[i] + " " + squares[i] + " " + quads[i]);
//} }
squarer.dispose(); squarer.dispose();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment