From 4e940fc09643dbd4ae45ee20082eba17d5e908f5 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Wed, 18 Oct 2017 23:58:08 -0400
Subject: [PATCH] fix: multiple resources pointed to the wrong location.
---
.../com/aparapi/examples/extension/FFTExample.java | 11 ++++++-----
.../com/aparapi/examples/extension/Histogram.java | 2 +-
.../aparapi/examples/extension/HistogramIdeal.java | 2 +-
.../java/com/aparapi/examples/extension/Mandel.java | 2 +-
.../com/aparapi/examples/extension/MandelBrot.java | 2 +-
.../com/aparapi/examples/extension/Pow4Example.java | 2 +-
.../com/aparapi/examples/extension/SquareExample.java | 2 +-
.../extension => resources}/HistogramKernel.cl | 0
.../aparapi/examples/extension => resources}/fft.cl | 0
.../examples/extension => resources}/mandel.cl | 0
.../examples/extension => resources}/mandel2.cl | 0
.../examples/extension => resources}/squarer.cl | 0
12 files changed, 12 insertions(+), 11 deletions(-)
rename src/main/{java/com/aparapi/examples/extension => resources}/HistogramKernel.cl (100%)
rename src/main/{java/com/aparapi/examples/extension => resources}/fft.cl (100%)
rename src/main/{java/com/aparapi/examples/extension => resources}/mandel.cl (100%)
rename src/main/{java/com/aparapi/examples/extension => resources}/mandel2.cl (100%)
rename src/main/{java/com/aparapi/examples/extension => resources}/squarer.cl (100%)
diff --git a/src/main/java/com/aparapi/examples/extension/FFTExample.java b/src/main/java/com/aparapi/examples/extension/FFTExample.java
index 9651d57b..d3143c73 100644
--- a/src/main/java/com/aparapi/examples/extension/FFTExample.java
+++ b/src/main/java/com/aparapi/examples/extension/FFTExample.java
@@ -35,12 +35,13 @@ import java.util.*;
public class FFTExample{
- @Resource("com/aparapi/examples/extension/fft.cl") interface FFT extends OpenCL<FFT>{
+ @Resource("fft.cl")
+ interface FFT extends OpenCL<FFT>{
- public FFT forward(//
- Range _range,//
- @GlobalReadWrite("real") float[] real,//
- @GlobalReadWrite("imaginary") float[] imaginary//
+ public FFT forward(
+ Range _range,
+ @GlobalReadWrite("real") float[] real,
+ @GlobalReadWrite("imaginary") float[] imaginary
);
}
diff --git a/src/main/java/com/aparapi/examples/extension/Histogram.java b/src/main/java/com/aparapi/examples/extension/Histogram.java
index 87ae8fd3..47f8de84 100644
--- a/src/main/java/com/aparapi/examples/extension/Histogram.java
+++ b/src/main/java/com/aparapi/examples/extension/Histogram.java
@@ -34,7 +34,7 @@ import com.aparapi.opencl.OpenCL.Resource;
public class Histogram{
- @Resource("com/aparapi/examples/extension/HistogramKernel.cl") interface HistogramKernel extends OpenCL<HistogramKernel>{
+ @Resource("HistogramKernel.cl") interface HistogramKernel extends OpenCL<HistogramKernel>{
public HistogramKernel histogram256(//
Range _range,//
diff --git a/src/main/java/com/aparapi/examples/extension/HistogramIdeal.java b/src/main/java/com/aparapi/examples/extension/HistogramIdeal.java
index a70a23af..7348e86c 100644
--- a/src/main/java/com/aparapi/examples/extension/HistogramIdeal.java
+++ b/src/main/java/com/aparapi/examples/extension/HistogramIdeal.java
@@ -78,7 +78,7 @@ public class HistogramIdeal{
final OpenCLDevice openclDevice = (OpenCLDevice) device;
final HistogramKernel histogram = openclDevice.bind(HistogramKernel.class, Histogram.class.getClassLoader()
- .getResourceAsStream("com/amd/aparapi/sample/extension/HistogramKernel.cl"));
+ .getResourceAsStream("HistogramKernel.cl"));
long start = System.nanoTime();
histogram.begin()//
.put(data)//
diff --git a/src/main/java/com/aparapi/examples/extension/Mandel.java b/src/main/java/com/aparapi/examples/extension/Mandel.java
index 23c71880..9885c1fa 100644
--- a/src/main/java/com/aparapi/examples/extension/Mandel.java
+++ b/src/main/java/com/aparapi/examples/extension/Mandel.java
@@ -49,7 +49,7 @@ import com.aparapi.opencl.OpenCL.Resource;
*
*/
-@Resource("com/aparapi/examples/extension/mandel2.cl")
+@Resource("mandel2.cl")
public interface Mandel extends OpenCL<Mandel>{
Mandel createMandleBrot(//
Range range,//
diff --git a/src/main/java/com/aparapi/examples/extension/MandelBrot.java b/src/main/java/com/aparapi/examples/extension/MandelBrot.java
index 03274dc8..74674ff4 100644
--- a/src/main/java/com/aparapi/examples/extension/MandelBrot.java
+++ b/src/main/java/com/aparapi/examples/extension/MandelBrot.java
@@ -42,7 +42,7 @@ import com.aparapi.opencl.OpenCL.Resource;
*
*/
-@Resource("com/aparapi/examples/extension/mandel2.cl")
+@Resource("mandel2.cl")
public interface MandelBrot extends OpenCL<MandelBrot>{
MandelBrot createMandleBrot(//
Range range,//
diff --git a/src/main/java/com/aparapi/examples/extension/Pow4Example.java b/src/main/java/com/aparapi/examples/extension/Pow4Example.java
index 0856f1a1..6f478085 100644
--- a/src/main/java/com/aparapi/examples/extension/Pow4Example.java
+++ b/src/main/java/com/aparapi/examples/extension/Pow4Example.java
@@ -34,7 +34,7 @@ import com.aparapi.opencl.OpenCL.Resource;
public class Pow4Example{
- @Resource("com/aparapi/examples/extension/squarer.cl")
+ @Resource("squarer.cl")
interface Squarer extends OpenCL<Squarer>{
public Squarer square(//
diff --git a/src/main/java/com/aparapi/examples/extension/SquareExample.java b/src/main/java/com/aparapi/examples/extension/SquareExample.java
index 598b68a8..55f04ba9 100644
--- a/src/main/java/com/aparapi/examples/extension/SquareExample.java
+++ b/src/main/java/com/aparapi/examples/extension/SquareExample.java
@@ -48,7 +48,7 @@ public class SquareExample{
@GlobalReadWrite("out") float[] out);
}
- @Resource("com/aparapi/examples/extension/squarer.cl") interface SquarerWithResource extends OpenCL<SquarerWithResource>{
+ @Resource("squarer.cl") interface SquarerWithResource extends OpenCL<SquarerWithResource>{
public SquarerWithResource square(//
Range _range,//
@GlobalReadWrite("in") float[] in,//
diff --git a/src/main/java/com/aparapi/examples/extension/HistogramKernel.cl b/src/main/resources/HistogramKernel.cl
similarity index 100%
rename from src/main/java/com/aparapi/examples/extension/HistogramKernel.cl
rename to src/main/resources/HistogramKernel.cl
diff --git a/src/main/java/com/aparapi/examples/extension/fft.cl b/src/main/resources/fft.cl
similarity index 100%
rename from src/main/java/com/aparapi/examples/extension/fft.cl
rename to src/main/resources/fft.cl
diff --git a/src/main/java/com/aparapi/examples/extension/mandel.cl b/src/main/resources/mandel.cl
similarity index 100%
rename from src/main/java/com/aparapi/examples/extension/mandel.cl
rename to src/main/resources/mandel.cl
diff --git a/src/main/java/com/aparapi/examples/extension/mandel2.cl b/src/main/resources/mandel2.cl
similarity index 100%
rename from src/main/java/com/aparapi/examples/extension/mandel2.cl
rename to src/main/resources/mandel2.cl
diff --git a/src/main/java/com/aparapi/examples/extension/squarer.cl b/src/main/resources/squarer.cl
similarity index 100%
rename from src/main/java/com/aparapi/examples/extension/squarer.cl
rename to src/main/resources/squarer.cl
--
GitLab