diff --git a/src/main/java/com/aparapi/examples/extension/FFTExample.java b/src/main/java/com/aparapi/examples/extension/FFTExample.java index 9651d57b666b72e3e4b0b97b7d296b3595192b5a..d3143c7381f0fdb248a80714893f596ea0d64c14 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 87ae8fd35a4a5751a0123095f67c9ce1e08b914b..47f8de84fa0aefb95cb2299b8d01ee12cf3d10ab 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 a70a23afecd250248237f5a5a4c766b6a5cef2cc..7348e86c964ea31ab37b77e09735d33087140b65 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 23c71880cc9115942dd73e4b194fa8e007217e52..9885c1fae651aa819f29a372a976dbb9d92579cf 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 03274dc8f0af6b246275c6c0fed30522261daddd..74674ff4f0f99cc91937fb5b4812d356273e504a 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 0856f1a1a5d5ee17a2a4f4b8ceabe4a78864967a..6f478085ced2eeb27cb0b9e3373d602be110932a 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 598b68a89d252707de94b27b01e62ae053a475bb..55f04ba937a1027140e72e7e655554bc830d77d5 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