diff --git a/README.md b/README.md index c69d73bd2396e106a6c1615cce97bdfe013e2fc5..314a0480856c7bd51f166d9ea7111d329ae39625 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Aparapi [](http://www.apache.org/licenses/LICENSE-2.0.html) -[](http://www.javadoc.io/doc/com.syncleus.aparapi/aparapi) +[](http://www.javadoc.io/doc/com.aparapi/aparapi) [](https://gitter.im/Syncleus/aparapi?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) A framework for executing native Java code on the GPU. @@ -14,7 +14,7 @@ A GPU has a unique architecture that causes them to behave differently than a CP Aparapi was originally a project conceived and developed by AMD corporation. It was later abandoned by AMD and sat mostly-idle for several years. Despite this there were some failed efforts by the community to keep the project alive, but without a clear community leader no new releases ever came. Eventually we came along and rescued the project, and modernized the project. Finally after such a long wait the first Aparapi release in 5 years was published and the community continues to push forward with renewed excitement. -For detailed documentation see [Aparapi.com](http://Aparapi.com) or check out the [latest Javadocs](http://www.javadoc.io/doc/com.syncleus.ferma/ferma). +For detailed documentation see [Aparapi.com](http://Aparapi.com) or check out the [latest Javadocs](http://www.javadoc.io/doc/com.aparapi.ferma/ferma). For support please use [Gitter](https://gitter.im/Syncleus/aparapi) or the [official Aparapi mailing list](https://groups.google.com/a/syncleus.com/d/forum/aparapi-list). @@ -27,7 +27,7 @@ To include Aparapi in your project of choice include the following Maven depende ```xml <dependency> - <groupId>com.syncleus.aparapi</groupId> + <groupId>com.aparapi</groupId> <artifactId>aparapi</artifactId> <version>1.0.0</version> </dependency> diff --git a/doc/AccessingMultiDimNDRangeProposal.md b/doc/AccessingMultiDimNDRangeProposal.md deleted file mode 100644 index 188cf9bab385a6267eb0723857ff5807c45609c4..0000000000000000000000000000000000000000 --- a/doc/AccessingMultiDimNDRangeProposal.md +++ /dev/null @@ -1,197 +0,0 @@ -#AccessingMultiDimNDRangeProposal -*A proposal for accessing multi-dim ND range execution Updated Dec 14, 2011 by frost.g...@gmail.com* - -We can discuss this proposal either here (in comments) or via the discussion list here. - -Note this is nothing to do with accessing Java 2D arrays in Aparapi. This discussion is focused on the ability to expose the execution of kernels over 1, 2 or 3 dimensions. The memory in each case is a single contiguous region (like a single dimension primitive array). - -At present an Aparapi kernel can only be executed using a single dimension. If we wish to represent execution over WIDTH x HEIGHT element grid we would execute over the range (WIDTH*HEIGHT) and manually divide/mod getGlobalID() by WIDTH to determine the x and y for each. - -Similarly we would multiply y by WIDTH and add x (y*WIDTH+x) to convert an X,Y location to a linear global id - - final static int WIDTH=128; - final static int HEIGHT=64; - final int in[] = new int[WIDTH*HEIGHT]; - final int out[] = new int[WIDTH*HEIGHT]; - Kernel kernel = new Kernel(){ - public void run(){ - int x = getGlobaId()%WIDTH; - int y = getGlobalID()/WIDTH; - if (!(x==1 || x==(WIDTH-1) || y==1 || y==(HEIGHT-1)){ - int sum = 0; - for (int dx =-1; dx<2; dx++){ - for (int dy =-1; dy<2; dy++){ - sum+=in[(y+dy)*WIDTH+(x+dx)]; - } - } - out[y*WIDTH+x] = sum/9; - // or out[getGlobalID()] = sum/9; - } - } - - }; - kernel.execute(WIDTH*HEIGHT); - -OpenCL natively allows the user to execute over 1, 2 or 3 dimension grids via the clEnqueueNDRangeKernel() method. - -We chose not to expose this in Aparapi but there have been requests for us to allow it. - -There are a number of things to consider here: - -1. Extending the syntax of kernel.execute() to allow multi dimensional grids. -1. Mapping Kernel methods to OpenCL's get_local_id(int dim), get_local_size(int dim), get_group_id(int_dim), etc. At present we map kernel.getGlobalId() to get_local_id(0). -1. Handling all of these when an application drops back to JTP mode. - -##Extending Kernel.execute(int range) -Sadly we can't overload Kernel.execute(int range), Kernel.execute(int xrange, int yrange) and Kernel.execute(int xrange, int yrange, int zrange) because we already have kernel.execute(int, int) mapped for executing mutiple passes over the linear range. - -Remember - - for (int pass=0; pass<20; pass++){ - kernel(1024); - } -Is equivalent to - - kernel(1024, 20); -I think I would prefer - - Kernel.execute(int range) - Kernel.execute(int range, int passes) - Kernel.executeXY(int xrange, int yrange) - Kernel.executeXY(int xrange, int yrange, int passes) - Kernel.executeXYZ(int xrange, int yrange, int zrange) - Kernel.executeXYZ(int xrange, int yrange, int zrange, int passes) - Obviously in the above calls we are only supplying the global bounds for the grid. We could also provide mappings allowing local ranges. I think I would prefer - - Kernel.executeLocal(int range, int local) - Kernel.executeLocal(int range, int local, int passes) - Kernel.executeXYLocal(int xrange, int yrange, int xlocalrange, int ylocalrange) - Kernel.executeXYLocal(int xrange, int yrange, int xlocalrange, int ylocalrange, int passes) - Kernel.executeXYZLocal(int xrange, int yrange, int zrange, int xlocalrange, int ylocalrange, int zlocalrange) - Kernel.executeXYZLocal(int xrange, int yrange, int zrange, int xlocalrange, int ylocalrange, int zlocalrange, int passes) -Another alternative may be to create Range classes - - class Range{ - int passes; - int width; - static Range create(int width); - static Range create(int width, int passes); - } - - class Range2D extends Range{ - int height; - static Range create(int width, int height); - static Range create(int width, int height, int passes); - - } - - class Range3D extends Range2D{ - int depth; - static Range create(int width, int height); - static Range create(int width, int height, int passes); - } -With appropriate constructors (or factory methods) to allow - - Kernel.execute(Range range) - -Then execute would be simply. - - Kernel.execute(Range.create(1,1)) - -We can also arrange for the group size to be placed in the base Range class. - - class Range{ - int groupSize; - int passes; - int width; - static Range create(int width); - static Range create(int width, int passes); - } - -##Mapping to OpenCL multi dim methods. i.e get_global_id(1), get_local_size(2) etc -We could just add getGlobalId(int dim), getLocalSize(int dim) etc to replicate OpenCL methods. - -I would prefer to offer the following global mappings - -|Kernel | OpenCL| -|-----|------| -|getGlobalId()| get_global_id(0)| -|getGlobalX()| get_global_id(0)| -|getGlobalY()| get_global_id(1)| -|getGlobalZ()| get_global_id(2)| -|getGlobalSize()| get_global_size(0)| -|getGlobalWidth()| get_global_size(0)| -|getGlobalHeight()| get_global_size(1)| -|getGlobalDepth()| get_global_size(2)| - -And the following local mappings - -|Kernel| OpenCL| -|-----|-------| -|getLocalId()| get_local_id(0)| -|getLocalX()| get_local_id(0)| -|getLocalY()| get_local_id(1)| -|getLocalZ()| get_local_id(2)| -|getLocalSize()| get_local_size(0)| -|getLocalWidth()| get_local_size(0)| -|getLocalHeight()| get_local_size(1)| -|getLocalDepth()| get_local_size(2)| - -##An example - - final static int WIDTH=128; - final static int HEIGHT=64; - final int in[] = new int[WIDTH*HEIGHT]; - final int out[] = new int[WIDTH*HEIGHT]; - Kernel kernel = new Kernel(){ - public void run(){ - int x = getGlobalX(); - int y = getGlobalY(); - if (!(x==1 || x==(getGlobalWidth()-1) || y==1 || y==(getGlobalHeight()-1)){ - int sum = 0; - for (int dx =-1; dx<2; dx++){ - for (int dy =-1; dy<2; dy++){ - sum+=in[(y+dy)*getGlobalWidth()+(x+dx)]; - } - } - out[y*getGlobalWidth()+x] = sum/9; - // or out[getGlobalID()] = sum/9; - } - } - - }; - kernel.executeXY(WIDTH, HEIGHT); - -Or if we choose the Range class approach. - - final static int WIDTH=128; - final static int HEIGHT=64; - final int in[] = new int[WIDTH*HEIGHT]; - final int out[] = new int[WIDTH*HEIGHT]; - Kernel kernel = new Kernel(){ - public void run(){ - int x = getGlobalX(); - int y = getGlobalY(); - if (!(x==1 || x==(getGlobalWidth()-1) || y==1 || y==(getGlobalHeight()-1)){ - int sum = 0; - for (int dx =-1; dx<2; dx++){ - for (int dy =-1; dy<2; dy++){ - sum+=in[(y+dy)*getGlobalWidth()+(x+dx)]; - } - } - out[y*getGlobalWidth()+x] = sum/9; - // or out[getGlobalID()] = sum/9; - } - } - - }; - kernel.execute(Range2D.create(WIDTH, HEIGHT)); - -##Handling this from JTP mode -Mapping to OpenCL for this is all fairly straightforward. - -In Java JTP mode we will have to emulate this. For get_global_id(0..3) (getGlobalX(), getGlobalY() and getGlobalZ() using our proposed Aparapi Java mappings) we can of course easily offer reasonable implementations, this just requires the Java code to essentially nest 3 loops (or emulate) and set globalX, globalY, globalZ inside each nesting. - -For get_local_size(0..3) (getLocalWidth(), getLocalHeight() and getLocalDepth() using our proposed Aparapi Java mappings) we will need to break the globalWidth/globalHeight and globalDepth into some arbitrary equal 'chunks' (note I am avoiding using the word groups here to avoid confusion with get_group_size(0..3)! - -At present we always create a synthetic group in JTP mode which is the the # or cores. This will need to be changed. If the user requests a grid (64,64,8,8) (global width 64, global height 64, local width 8, local height 8) then we will have to create a JTP group of 64 (8x8) and just in case the kernel code contains a barrier, we will need to ensure we launch 64 threads for this group. From our experience it is best to launch one thread per core, so we may lose some JTP performance executing in this mode. \ No newline at end of file diff --git a/doc/AddingLambdasToAparapi.md b/doc/AddingLambdasToAparapi.md deleted file mode 100644 index 07e9ab9fed7d3bc3de78308393a13c2d8fd6c55e..0000000000000000000000000000000000000000 --- a/doc/AddingLambdasToAparapi.md +++ /dev/null @@ -1,106 +0,0 @@ -#AddingLambdasToAparapi -*Adding Java 8 Lambda Support to Aparapi Updated Jun 24, 2013 by frost.g...@gmail.com* - -In the recently added ''lambda'' branch we have been experimenting with adding lambda support to Aparapi. We believe that this upcomming Java 8 feature will be a natural way to express parallel algorithms which can be executed on the GPU. - -A link to the branch can be found here preview. - -You will need to get the latest binary build of ''Project Lambda'' to experiment with these new features. The 'Project Lambda' preview can be found here. - -Once you have a Lambda enabled Java 8 JDK Java set JAVA_HOME to your Java8 Lambda enabled compiler and build Aparapi. - -So from the root of SumatraExperiments just use - - $ ant -We are slowly walking through some of the Aparapi demos and converting them. At present NBody and Mandel have been converted. - -With Lambda enabled Aparapi we remove the need to derive from a base Kernel class, we will allow the user to express their code as a lambda using the following basic pattern - - Device.bestGPU().forEach(int range, IntConsumer lambda); -The Java 8 stream API defines a type called java.util.function.IntConsumer. This is essentially an interface with a Single Abstract Method (these types are referred to as SAM types in the stream API code). - -IntConsumer looks something like.... - - interface IntConsumer{ - public void accept(int Id); - } -So you can run the familiar 'squares' kernel using - - int in[] = ..// - int out[] = .../ - Device.bestGPU().forEach(in.length, (i)->{ - out[i] = in[i] * in[i]; - }); - -Instead of - - int in[] = ..// - int out[] = .../ - Device.bestGPU().forEach(in.length, new IntConsumer(){ - public void accept(int i){ - out[i] = in[i] * in[i]; - } - }); - -To accomodate lambda's we created Device.forEach(int range, IntConsumer ic) which converts the bytecode of the ic parameter to OpenCL at runtime. The captured args (in, out and i - in this case) are passed to the GPU and the kernel executed. - -During our early experiments we encountered an interesting issue. The new 'lambdafied' javac uses Java 7 method handles and invoke dynamic instructions to dispatch the lambda code. It does this by injecting a call to a MethodHandle factory into the call site. At runtime, this factory creates a synthetic class (to capture call-site args) and passes this to our Device.forEach(). - -We needed to analyse this synthetically generated class in order to work out which args need to be sent to the GPU. Of course we have a bunch of tools already in Aparapi for analyzing bytecode, but this code expects to find bytecode in class files (either in a Jar or on the disk), we had to find a way to access these classfile bytes to Aparapi. - -We have a couple of proposed solutions for solving this. The most promising is to turn the aparapi.dll/aparapi.so native library (used by Aparapi at runtime) into a JVMTI agent (like hprof). JVMTI agents are native libraries which have access to some aspects of a running JVM (via the JVM Tool Interface). We havea prototype JVMTI agent which 'listens' for classfiles which represent these 'synthetic lambda helpers' and allows us to get hold of the bytecode for these classes. - -This will mean that in future we will change how Aparapi is launched. - -Instead of - - $ java -Djava.library.path=path/to/aparapi -classpath path/to/aparapi/aparapi.jar:your.jar YourClass - -We will use - - $ java -agentlib=path/to/aparapi/aparapi.dll -classpath path/to/aparapi/aparapi.jar:your.jar YourClass -We are also looking into the possibility of having this agent provide the bytecode for all Aparapi classes. We believe that this will enable us to ultimately remove MethodModel/ClassModel and even the InstructionSet classes and handling all of this in JNI. - -We would welcome comments on these proposals. Either here, or in the discussion list. Let us know what you think. - -##Consequences of lambdification of Aparapi. - -* No support for local memory, group size or barriers in Lambda form -* Calls to Kernel base class methods (such as getGlobalId()) will not be allowed. The 'global id' will be passed as an arg to the lambda. -* We will need to add support for calling static methods (of course the bytecode for the called methods cannot violate Aparapi restrictions). -* We might need to drop support for multi dimension dispatch. This is more a convergence story with Sumatra (which is unlikely to support this) -* Unlikely that explicit buffer management will be simple. -* We can use lambda's for control as well as the kernel itself. See examples below. - -##Alternate forms for kernel dispatch - -This version would allow us to carry over Aparapi's device selection - - Device.bestGPU().forEach(1024, i->{lambda}); -This version would allow us to carry over Aparapi's Range selection - - Device.bestGPU().range2D(width, height).forEach(1024, rid->{lambda}); -This version would allow us to mimic Kernel.execute(1024, 5) - - Device.bestGPU().forEach(1024, 5, (id, passid)->{lambda}); -We could even have the range iterated over until some other lambda determines we are done - - Device.bestGPU().forEachUntil(1024, id->{lambda}, ->{predicate lambda}); -Explicit buffer handling could be removed in many cases by allowing the bytecode of the 'until' predicate to be snooped for buffer references. - - int lotsOfData[] = ...; - boolean found[false] = new boolean[1]; - Device.bestGPU().forEachUntil(1024, 5, - (id, passid)->{ /* mutate lotsOfData, found[0]=true when done */ } - ->{found[0]]}); -In the above cases Aparapi can determine that between each pass it needs to ''ONLY'' copy found[] back from the device. - -There is no reason that the range itself needs to be constant, we can use a collection/iterable. This helps with some reductions. - - int range[] = new int[]{1024,512,128,64,32,16,8,4,2,1,0}; - Device.bestGPU().forEach(range,{lambda}); -or the range can be a lambda itself, here we specify a start and end value for the range itself, and a lambda to provide each step. - - Device.bestGPU().forEach(1024, 1, r->{return(r/2);},(pass, r, id)->{lambda}); - // or - Device.bestGPU().forEach(1, 1024, r->{return(r*2);},(pass, r, id)->{lambda}); diff --git a/doc/AddressSpacesUsingBuffers.md b/doc/AddressSpacesUsingBuffers.md deleted file mode 100644 index a311db2f4e98dce9b71fec915c0b19c5859358ae..0000000000000000000000000000000000000000 --- a/doc/AddressSpacesUsingBuffers.md +++ /dev/null @@ -1,44 +0,0 @@ -#AddressSpacesUsingBuffers -*Proposal For OpenCL address space support using java Buffers instead of arrays. Updated Dec 8, 2011 by frost.g...@gmail.com* -The general idea is to have a AS_PRIMTYPE_Buffer for each AS=address space and PRIM=primitive type. Here is an example for LocalFloatBuffer which would be a buffer for floats that got mapped to OpenCL local address space. - -As with normal FloatBuffers, the float elements are accessed using get and put methods - -Although a LocalFloatBuffer conceptually exists only for the lifetime of a workgroup, it is still constructed in the enclosing Kernel, not in the Kernel.Entry.run method. (Aparapi does not support constructing new objects inside the Kernel.Entry.run method). - -A typical declaration would be: - - LocalFloatBuffer locbuf = new LocalFloatBuffer{12); -The argument 12 here means that 12 floats would be used by each workitem in the workgroup. So the total buffer would be LocalSize*12 floats. Aparapi would at runtime allocate a total local OpenCL buffer to be this size. Note how this removes the need for the programmer to specify localSize anywhere. - -Note: For each Kernel.Entry.execute(globalSize) call, the runtime will determine an appropriate workgroup size, also called localSize, depending on the capabilities of the device, and on the globalSize. The localSize will always evenly divide the globalSize, in other words all workgroups for an execute context will be the same size. A workitem can determine localSize by calling getLocalSize(). - -Because workitems operate simultaneously and in an undetermined order, workitems will generally only use put on its own portion of the LocalFloatBuffer between the LocalBarriers, and will generally only use get outside the LocalBarriers. - -Some example code (from NBody) follows. Here each workitem copies a "BODY" consisting of 4 floats. The global array contains 4*globalSize floats, and we want to iterate thru this global array, copying it into local memory and operating on it there. This will take globalSize/localSize "tiles". For each tile, each workitem fills in one "BODY"'s worth or 4 elements - - // outside run method... - final int BODYSIZE = 4; - LocalFloatBuffer pos_xyzm_local = new LocalFloatBuffer(BODYSIZE); - // - // inside run method... - int numTiles = globalSize / localSize; - for (int i = 0; i < numTiles; ++i) { - // load one tile into local memory - int idx = i * localSize + localId; // index into a global memory array - localBarrier(); - pos_xyzm_local.put(localId * BODYSIZE + 0, pos_xyzm[idx * BODYSIZE + 0]); - pos_xyzm_local.put(localId * BODYSIZE + 1, pos_xyzm[idx * BODYSIZE + 1]); - pos_xyzm_local.put(localId * BODYSIZE + 2, pos_xyzm[idx * BODYSIZE + 2]); - pos_xyzm_local.put(localId * BODYSIZE + 3, pos_xyzm[idx * BODYSIZE + 3]); - // Synchronize to make sure data is available for processing - localBarrier(); - - // now the entire LocalFloatBuffer has been filled. - // each workitem might use the entire Buffer - // which consists of localSize BODYs - for (int j = 0; j < localSize; ++j) { - float r_x = pos_xyzm_local.get(j * BODYSIZE + 0) - myPos_x; - float r_y = pos_xyzm_local.get(j * BODYSIZE + 1) - myPos_y; - float r_z = pos_xyzm_local.get(j * BODYSIZE + 2) - myPos_z; - // ...etc \ No newline at end of file diff --git a/doc/AparapiExtensionProposal.md b/doc/AparapiExtensionProposal.md deleted file mode 100644 index 087695cb29f920e57d084439b1a4cd616b8251a8..0000000000000000000000000000000000000000 --- a/doc/AparapiExtensionProposal.md +++ /dev/null @@ -1,258 +0,0 @@ -#AparapiExtensionProposal -*A proposed aparapi extension mechanism. Updated Feb 29, 2012 by frost.g...@gmail.com* - -##Here is a proposed Aparapi extension mechanism -This would allow a developer to create a library that could be used by Aparapi Kernel code. The library would include OpenCL and Java implementations. - -We will treat this as a live document. Please join the discussions at http://groups.google.com/group/aparapi-discuss/browse_thread/thread/7ec81ecb2169aa4 and I will update this page to reflect what I think the latest decisions are:- - -Currently Aparapi allows Java bytecode to be converted to OpenCL at runtime. Only the OpenCL generated by this conversion process is made available. Sometimes for performance reasons we might want to allow hand coded OpenCL to be called from Aparapi kernel code. - -Here we will present a strawman API which would allow extension points to be added by an end user or by a library provider. - -We will use an FFT usecase to walk through the steps. - -The FFT (Fast Fourier Transform) algorithm can be coded in Aparapi, but for performance reasons handcrafted OpenCL is likely to be more performant. The goal is to allow Aparapi to do what it does best, i.e. manage the host buffer allocations and provide a mechanism for binding arbitrary opencl code at runtime. - -So lets assume we wanted an Aparapi Kernel to be able to call an Aparapi extension for computing FFT (forward and reverse). The Kernel implementation might look like this. - - public static class BandStopFilter extends Kernel{ - FFT fft = new FFT(); // Create an instance of the Extension point. - float[] real; - float[] imaginary; - - BandStopFilter (float[] _real){ - real = _real; - imaginary = new float[_real.length]; - - } - - @Override public void run() { - fft.forward(real, imaginary); - } - } - -The main method then would just execute the Kernel using the familiar kernel.execute() method :- - - public static void main(String[] args) { - float[] data = new float[1024]; - BandStopFilter kernel = new BandStopFilter (data); - kernel.execute(data.length); - } - -Essentially we want the FFT.forward(float[] _real, float[] _imaginary) and FFT.reverse(float[] _real, float[] _imaginary) methods to be callable from Aparapi Kernel code. We want Aparapi to handle the call-forwarding and the argument/buffer mapping transfers. We want Aparapi to call the Java methods normally if OpenCL is not available but would like Aparapi to use the implementor provided OpenCL if it is. So the implementor will be required to provide both a Java and an OpenCL version of the callable methods because Aparapi will decide which version needs to be called ant runtime. - -Any extension point is required to implement the AparapiExtensionPoint interface. - -public class AparapiExtensionPoint - public String getOpenCL(); -} -Here is a possible (although incomplete) FFT implementation. - - public class FFT implements AparapiExtensionPoint{ - @AparapiCallable public void forward( - @Global @ReadWrite float[] _data, - @Global @ReadWrite float[] _imaginary) { - // java implementation - } - - @AparapiCallable public void reverse( - @Global @ReadWrite float[] _data, - @Global @ReadWrite float[] _imaginary) { - // java implementation - } - - @Override public String getOpenCL() { - return "" - +"void my_package_FFT_forward(" - +" __global float* _real," - +" __global float* _imaginary )" - +" {" - +" // OpenCL implemention" - +" }" - +"void my_package_FFT_reverse(" - +" __global float* _real," - +" __global float* _imaginary )" - +" {" - +" // OpenCL implemention" - +" }"; - } - } - -The implementer’s class will be required to define the callable aparapi methods as well as implement the `getOpenCL()` method so that the OpenCL implementation of those methods can be extracted at run-time. - -Aparapi will provide annotations to decorate the methods and args/parameters of the exposed callable methods . These annotations provide information so that Aparapi locate the callable methods as well as parameter hints to help coordinate buffer types (global, local, constant) and transfer directions (read,write, readWrite) when executing the methods from a Kernel. This information is consulted during the normal bytecode analysis that Aparapi provides when Aparapi hits the call site. - -Note that the Java code inside the `@AparapiCallable` functions (or code executed from it) is not constrained to the normal Aparapi subset. It can be any legitimate Java code, but should be thread safe (because it will be called from JTP mode!). - -Note also that the OpenCL code yielded from the `getOpenCL()` method is assumed to be complete, Aparapi does not attempt to parse this code. If the code fails to compile Aparapi will fallback and execute the whole Kernel in JTP mode. - -BTW we show getOpenCL() returning a String literal. This is most likely to be how code is returned. However, it could be extracted from a File? a resource in the Jar file? or dynamically generated based on some state. For example an FFT implementation might choose to use different code for radix2 or radix4 implementations (based on a paramater passed to `FFT()` constructor - say `FFT(FFT.RADIX2))` in which case the getOpenCL() method might yield different code. - -The above proposal covers the case where a third party might want to provide an Aparapi extension point as a library. - -We might also consider allowing single methods within the Kernel to be optimized, where the OpenCL is made available via the AparapiCallable annotation. The method would still use the same Annotations for the args (to allow buffer txfers to be optimized). - - Kernel k = new Kernel(){ - @AparapiCallable(†/* opencl code for sum() goes here */â€) - int sum(@Global @ReadWrite int[] data, int length){ - int sum = 0; - for (int v:data){ - sum+=v; - } - } - @Override public void run(){ - sum(data); - } - } - -Here are the proposed new interfaces/annotations - - public interface AparapiExtensionPoint { - public String getOpenCL(); - } - @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) - public @interface AparapiCallable { - String value default NULL; - } - - @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.PARAMETER) - public @interface Global {} - - @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.PARAMETER) - public @interface Local {} - - @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.PARAMETER) - public @interface Constant {} - - @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.PARAMETER) - public @interface ReadWrite {} - - @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.PARAMETER) - public @interface ReadOnly {} - - @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.PARAMETER) - public @interface WriteOnly {} - -And here is the example code in one chunk - - public class FFT implements AparapiExtensionPoint{ - @AparapiCallable public void forward( - @Global @ReadWrite float[] _data, - @Global @ReadWrite float[] _imaginary) { - // java implementation - } - - @AparapiCallable public void reverse( - @Global @ReadWrite float[] _data, - @Global @ReadWrite float[] _imaginary) { - // java implementation - } - - @Override public String getOpenCL() { - return "" - +"void my_package_FFT_forward(" - +" __global float* _real," - +" __global float* _imaginary )" - +" {" - +" // OpenCL implemention" - +" }" - +"void my_package_FFT_reverse(" - +" __global float* _real," - +" __global float* _imaginary )" - +" {" - +" // OpenCL implemention" - +" }"; - } - } - - public class BandStopFilter extends Kernel{ - FFT fft = new FFT(); - float[] real; - float[] imaginary; - - BandStopFilter (float[] _real){ - real = _real; - imaginary = new float[_real.length]; - - } - - @Override public void run() { - fft.forward(real, imaginary); - } - } - - public static void main(String[] args) { - float[] data = new float[1024]; - BandStopFilter kernel = new BandStopFilter (data); - kernel.execute(data.length); - } - -After discussion I think we are converging on a less complex solution. This is based on Witold's feedback suggestion (see below) where we use OpenCL annotations rather than forcing the implementation of the interface and the `getOpenCL()` method as originally suggested. - -So we will create an `@OpenCL` annotation for classes/methods. - -The `@OpenCL` annotation on the methods will contain the OpenCL source replacement for a specific method. The arg list will be created by Aparapi. - -The @OpenCL annotation on a class allows us to optionally introduce common code (helper methods, #pragmas, constants) which will precede the method declarations in the OpenCL code. - -So an FFT example whereby forward() and reverse() methods both called a common foo() method might look like this. - - @OpenCL(common="/* common void foo(){} + maybe #pragmas + accessable - global fields declared here */") - public class FFT extends AparapiExtensionPoint { - @OpenCL(signature="//function signature - OPTIONAL", body="{ /* uses foo(); */ }") - public void forward( - @Global @ReadWrite float[] _data, - @Global @ReadWrite float[] _imaginary) { - // java implementation - } - @OpenCL(function="{ /*uses foo(); */) }") - public void reverse( - @Global @ReadWrite float[] _data, - @Global @ReadWrite float[] _imaginary) { - // java implementation - } - } - } - -To invoke from an Aparapi kernel. We should be able to do something like - - public class BandStopFilter extends Kernel{ - FFT fft = new FFT(); - float[] real; - float[] imaginary; - - BandStopFilter (float[] _real){ - real = _real; - imaginary = new float[_real.length]; - - } - - @Override public void run() { - fft.forward(this, real, imaginary); - } - } - - public static void main(String[] args) { - float[] data = new float[1024]; - BandStopFilter kernel = new BandStopFilter (data); - kernel.execute(data.length); - } - -Ideally we would also like to invoke FFT directly (instead of via a Kernel). This is tricky because the forward()} and reverse() methods will need to be invoked across a range and of course the dispatch across the range needs to be initiated from Aparapi. - -The only way I can see how to do this is to force the creation of an interface so we can use Java's existing Proxy mechanism to create a wrapper. - - @OpenCL(wraps=FFT.class); - interface FFTInterface{ - public void forward( Range _range, float[] _data, float[] _imaginary); - public void reverse( Range _range, float[] _data, float[] _imaginary); - } - Then provide a mechanism for extracting a proxy and invoking it. - - float[] real = //?? - float[] imag = //?? - Aparapi.wrap<FFT>(FFTInterface.class).forward(range, real, imag); - -I can't see a cleaner solution. diff --git a/doc/AparapiPatterns.md b/doc/AparapiPatterns.md deleted file mode 100644 index 7baf1cbb8589c533aae1724508974ad1c8ec08fe..0000000000000000000000000000000000000000 --- a/doc/AparapiPatterns.md +++ /dev/null @@ -1,129 +0,0 @@ -#AparapiPatterns -*Examples and code fragments to demonstrate Aparapi fetaures. Updated Jul 24, 2012 by frost.g...@gmail.com* - -##Aparapi Patterns - -The following suggestions help solve some common problems found in using Aparapi. - -Additional suggestions and solutions to extend this list would be welcome. - -##How do I return data from a kernel if I can’t write to kernel fields? - -Use a small array buffer (possibly containing a single element) and assign it from the kernel. - -For example, the following kernel code detects whether the buffer[] contains the value 1234. The flag (true or false) is returned in found[0]. - - final int buffer[] = new int[HUGE]; - final boolean found[] = new boolean[]{false}; - // fill buffer somehow - kernel kernel = new kernel(){ - @Override public void run(){ - if (buffer[getGlobald()]==1234){ - found[0]=true; - } - } - }; - kernel.execute(buffer.length); - -This code does include a race condition, whereby more than one value of `Kernel.getGlobalId()` might contain 1234 and try to set `found[0]`. This is not a problem here, because we don't care if multiple kernel executions match, provided one flips the value of `found[0]`. - -##How can I use Aparapi and still maintain an object-oriented view of my data? - -See the NewFeatures page. Aparapi can now handle simple arrays of objects, which minimizes the amount of refactoring required to experiment with Aparapi. However, performance is still likely to be better if your algorithm operates on data held in parallel primitive arrays. To get higher performance from Aparapi with minimal exposure to data in this parallel primitive array form, we can (with a little work) allow both forms of data to co-exist. Let’s reconsider the NBody problem (http://en.wikipedia.org/wiki/N-body_problem) . - -A Java developer writing an NBody solution would most likely create a Body class: - - class Body{ - float x,y,z; - float getX(){return x;} - void setX(float _x){ x = _x;} - float getY(){return y;} - void setY(float _y){ y = _y;} - float getZ(){return z;} - void setZ(float _z){ z = _z;} - - - // other data related to Body unused by positioning calculations - } - -The developer would also likely create a container class (such as NBodyUniverse), that manages the positions of multiple Body instances. - - class NBodyUniverse{ - final Body[] bodies = null; - NBodyUniverse(final Bodies _bodies[]){ - bodies = _bodies; - for (int i=0; i<bodies.length; i++){ - bodies[i].setX(Math.random()*100); - bodies[i].setY(Math.random()*100); - bodies[i].setZ(Math.random()*100); - } - } - void adjustPositions(){ - // can use new array of object Aparapi features, but is not performant - } - } - Body bodies = new Body[BODIES]; - for (int i=0; i<bodies; i++){ - bodies[i] = new Body(); - } - NBodyUniverse universe = new NBodyUniverse(bodies); - while (true){ - universe.adjustPositions(); - // display NBodyUniverse - } - -The NBodyUniverse.adjustPostions() method contains the nested loops (adjusting each body position based on forces impinging on it from all of the other bodies), making it an ideal Aparapi candidate. - -Even though this code can now be written by accessing the x, y and z ordinates of Body[] via getters/setters, the most performant Aparapi implementation is the one that operates on parallel arrays of floats containing x, y and z ordinates, with Body[10]’s state conceptually stored across x[10], y[10] and z[10]. - -So for performance reasons, you can do something like this: - - class Body{ - int idx; - NBodyUniverse universe; - void setUniverseAndIndex(NBodyUniverse _universe, int _idx){ - universe = _universe; - idx = _idx; - } - - // other fields not used by layout - - void setX(float _x){ layout.x[idx]=_x;} - void setY(float _y){ layout.y[idx]=_y;} - void setZ(float _z){ layout.z[idx]=_z;} - float getX(){ return layout.x[idx];} - float getY(){ return layout.y[idx];} - float getZ(){ return layout.z[idx];} - } - class NBodyUniverse { - final Body[] bodies; - final int[] x, y, z; - NBodyUniverse(Body[] _bodies){ - bodies = _bodies; - for (int i=0; i<bodies.length; i++){ - bodies[i].setUniverseAndIndex(this, i); - bodies[i].setX(Math.random()*100); - bodies[i].setY(Math.random()*100); - bodies[i].setZ(Math.random()*100); - } - } - void adjustPositions(){ - // can now more efficiently use Aparapi - } - } - - - - Body bodies = new Body[BODIES]; - for (int i=0; i<bodies; i++){ - bodies[i] = new Body(); - } - NBodyUniverse universe = new NBodyUniverse(bodies); - while (true){ - universe.adjustPositions(); - // display NBodyUniverse - } - -This example allows Javaâ„¢ code to treat each Body in a traditional object-oriented fashion and also allows Aparapi kernels to act on the parallel primitive array form, in order to access/mutate the position of the bodies. - -[Attribution](Attribution.md) \ No newline at end of file diff --git a/doc/Attribution.md b/doc/Attribution.md deleted file mode 100644 index 52ab3813e7eec37fd5751196eae30b8a18c0ae59..0000000000000000000000000000000000000000 --- a/doc/Attribution.md +++ /dev/null @@ -1,26 +0,0 @@ -#Attribution -*Attribution Updated Sep 13, 2011 by frost.g...@gmail.com* - -##Attribution - -AMD, AMD Radeon, the AMD arrow logo, and combinations thereof are trademarks of Advanced Micro Devices, Inc. - -OpenCL is a trademark of Apple Inc used under license to the Khronos Group, Inc. - -NVIDIA, the NVIDIA logo, and CUDA are trademarks or registered trademarks of NVIDIA Corporation. - -Java , JVM, JDK and “Write Once, Run Anywhere" are trademarks of Oracle and/or its affiliates. - -Eclipse and the related logos are a trademark of The Eclipse Foundation in the United States, other countries, or both. - -Microsoft, Windows, Visual Studio, Visual Studio Express Edition are trademarks of Microsoft Corporation in the United States, other countries, or both. - -Linux is a registered trademark of Linus Torvalds - -Ubuntu is a trademark of Canonical Ltd - -Red Hat is a registered trademark of Red Hat, Inc. in the United States and other countries. - -OpenGL® and the oval logo are trademarks or registered trademarks of Silicon Graphics, Inc. in the United States and/or other countries worldwide. - -All other names used in this documentation are for identification purposes only and may be trademarks of their respective owners. diff --git a/doc/BuildingNBody.md b/doc/BuildingNBody.md deleted file mode 100644 index b6fab1a0dc792eeaefa968b7ba2b188c96e39bba..0000000000000000000000000000000000000000 --- a/doc/BuildingNBody.md +++ /dev/null @@ -1,40 +0,0 @@ -#BuildingNBody -*How to build the NBody example. Updated Nov 11, 2011 by frost.g...@gmail.com* -##Building NBody -The NBody example is located in the/ examples subdirectory under the Aparapi trunk: - - trunk/ - ... - examples/ - ... - nbody/ - src/java/com.syncleus.aparapi.nbody/ - build.xml - nbody.sh - nbody.bat -The NBody example requires a little more work to build because it depends on a third party project named ‘JOGL’. - -JOGL is a set of OpenGLâ„¢ bindings for Java® and the NBody example uses this library to render the particles/bodies (potentially many thousands of them) at runtime. More information about JOGL can be found here http://jogamp.org/jogl/www. - -The build.xml file build target will download the jars required to build and run the nbody example if the files do not exist. - -To build nbody, perform the following commands. - - C:> ant clean build -The NBody build.xml file includes a ‘run’ target so you can launch the application using. - - C:> ant run -Or if you prefer to launch from either the nbody.sh or nbody.bat script. - -For Linux® we also need to chmod nbody.sh in order to execute it. - - chmod +x nbody.sh -The nbody scripts take the execution mode as the first argument, the number of bodies as the second argument, and then the height and width (in pixels). - -Windows example: - - C:> nbody GPU 32768 800 800 -Linux example: - - $ ./nbody.sh GPU 32768 800 800 -Attribution \ No newline at end of file diff --git a/doc/ByteCode2OpenCL.pdf b/doc/ByteCode2OpenCL.pdf deleted file mode 100644 index 6d51d746f087b8e4fa74a42a1580e5fcb00f5336..0000000000000000000000000000000000000000 Binary files a/doc/ByteCode2OpenCL.pdf and /dev/null differ diff --git a/doc/ChoosingSpecificDevicesForExecution.md b/doc/ChoosingSpecificDevicesForExecution.md deleted file mode 100644 index 62b4ce089e982347ece86397f538793849c5918e..0000000000000000000000000000000000000000 --- a/doc/ChoosingSpecificDevicesForExecution.md +++ /dev/null @@ -1,58 +0,0 @@ -#ChoosingSpecificDevicesForExecution -*Using the new Device API's to choose Kernel execution on a specific device. Updated Sep 18, 2012 by frost.g...@gmail.com* - -Previously Aparapi chose the first GPU device when Kernel.execute() was called. This make it easy to execute simple Kernels, but was problematic when users wished finer control over which device should be chosen. Especially when the first device may be unsuitable. We recently added new classes and API's to allow the developer to specify exactly which device we intend to target. - -A new Device class has been added. This allows the user to select a specific device; either by calling a helper method Device.firstGPU() or Device.best(). Or by allowing the user to iterate through all devices and choose one based on some other criteria (capabilities? vendor name?). - -So selecting the 'best' (most performant) device could be achieved using. - - Device device = Device.best(); - -Alternatively if I wanted the first AMD GPU device I might use:- - - Device chosen=null; - for (Device device: devices.getAll()){ - if (device.getVendor().contains("AMD") && device.isGPU()){ - chosen = device; - break; - } - } - -A Device can be queried `(isGPU(), isOpenCL(), isGroup(), isJava(), getOpenCLPlatform(), getMaxMemory(), getLocalSizes())` to yield it's characteristics. - -To execute on a specific device we must use the device to create our range. - - Range range = device.createRange2D(width, height); - -This allows the Range to be created with knowledge of the underlying device. So for example device.createRange3D(1024, 1024, 1024, 16, 16, 16) will fail if the device does not allow a local size of (16x16x16). - -A range created using a device method captures the device which created it. The range instance has a device field which is set by the device which creates it. - -It's as if we had this code - - Range range = Range.create(width, height); - range.setDevice(device); - -So the Range locks the device that it can be used with. - -Now when we have a Kernel. - - Kernel kernel = new Kernel(){ - @Override public void run(){ - ... - } - } - -And we then use a device created range. - - Device device = Device.firstGPU(); - Kernel kernel = new Kernel(){ - @Override public void run(){ - // uses input[]; - } - }; - range = device.createRange2D(1024, 1024); - kernel.execute(range); - -We have forced execution on the first GPU. diff --git a/doc/ContributionGuide.md b/doc/ContributionGuide.md deleted file mode 100644 index c3f8d219c8b20f53f627d53bebf05b00ffa63757..0000000000000000000000000000000000000000 --- a/doc/ContributionGuide.md +++ /dev/null @@ -1,48 +0,0 @@ -#ContributionGuide -*How to contribute (bug fix or features). Updated Sep 13, 2011 by frost.g...@gmail.com* -##Contribution Guide -We welcome all contributions to add new features to Aparapi and make Aparapi more useful and high performing. These guidelines are intended to describe and streamline the contribution process. - -A patch can be a bug fix, a new feature, a new JUnit test case or a documentation change. - -Only members of the commit team are able to commit changes to the SVN repository. - -Only patches submitted through the process described below will be committed to SVN. - -The commit team will only applying patches which are submitted via the Aparapi project’s issue list. - -http://code.google.com/p/aparapi/issues/list -The current commit team members are: -* Eric Caspole (AMD) -* Tom Deneau (AMD) -* Gary Frost (AMD) - -If you would like to be considered for inclusion in the commit team, please send an email to anyone on the team and let them know. - -##Submitting a patch -If the bug or enhancement does not yet appear in the issues list, please take the time add a new issue. - -Be sure to include sufficient detail to explain and recreate the bug or to justify the proposed enhancement. - -Ensure that your patch/fix does not regress any of existing JUnit tests. The UnitTestGuide wiki page describes how to run the various Aparapi unit tests. - -Ensure that your patch does not break any sample or example. Create a patch file (using SVN’s diff command) against a recently updated trunk, do not submit patches against branches. Name your patch file using the following filename convention - - aparapi-<issue id>-<trunk revision id>.patch -The following shows the sequence for creating a patch for issue number 1234. - - $ cd aparapi-trunk - $ svn update - At revision 10339 - $ svn -diff > aparapi-1234-10339.patch - -Attach your patch file to the issue via Issue List. - -## Attribution of contributions -We want to correctly attribute all contributions and will maintain a CREDITS.txt file at the head of the trunk. We discourage including attribution as comments in the code, instead we intend to let the history feature of SVN be the primary method for tracking attributions. When patch is committed the commit team member will update the CREDITS.txt file and apply your patch, then will include your name (and email if you desire) as part of the SVN commit history. - -## Contributions made under a different license than the existing BSD derived license -We cannot accept contributions or patches which are subject to other licenses. - -Attribution - diff --git a/doc/ConvertingBytecodeToOpenCL.md b/doc/ConvertingBytecodeToOpenCL.md deleted file mode 100644 index e839c0d527a5b2ab80a1d735f7d3bf426047919f..0000000000000000000000000000000000000000 --- a/doc/ConvertingBytecodeToOpenCL.md +++ /dev/null @@ -1,282 +0,0 @@ -#ConvertingBytecodeToOpenCL - -*How Aparapi converts bytecode to OpenCL Updated Aug 23, 2012 by frost.g...@gmail.com* - -##Introduction - -[try this](ByteCode2OpenCL.pdf) - -One of the unique Aparapi features is it's ability to convert Java bytecode to OpenCL automatically. - -In this page we will try to describe the process used to perform this conversion. If you are unfamiliar with bytecode consider visiting this page WhatIsBytecode. - -The command - - javac Source.java - -Will compile the java source file Source.java to Source.class - -The classfile format is well documented here and we will not go into too much detail here, however it should be known that Aparapi must parse the classfile of each Kernel to extract the bytecode for the Kernel.run() and any method reachable from Kernel.run(). - -Lets start with a simple Kernel. - - import com.syncleus.aparapi.Kernel; - - public class Squarer extends Kernel{ - int[] in; - int[] out; - @Override public void run(){ - int gid = getGlobalId(0); - out[gid] = in[gid] * in[gid]; - } - } - -We will compile this - - javac -g -cp path/to/aparapi/aparapi.jar Squarer.java - -and then we can look at the bytecode using javap - - javap -c -classpath path/to/aparapi/aparapi.jar;. Squarer - -Compiled from "Squarer.java" - - public class Squarer extends com.syncleus.aparapi.Kernel - SourceFile: "Squarer.java" - minor version: 0 - major version: 50 - Constant pool: - const #1 = Method #6.#17; // com/amd/aparapi/Kernel."<init>":()V - const #2 = Method #5.#18; // Squarer.getGlobalId:(I)I - const #3 = Field #5.#19; // Squarer.out:[I - const #4 = Field #5.#20; // Squarer.in:[I - const #5 = class #21; // Squarer - const #6 = class #22; // com/amd/aparapi/Kernel - const #7 = Asciz in; - const #8 = Asciz [I; - const #9 = Asciz out; - const #10 = Asciz <init>; - const #11 = Asciz ()V; - const #12 = Asciz Code; - const #13 = Asciz LineNumberTable; - const #14 = Asciz run; - const #15 = Asciz SourceFile; - const #16 = Asciz Squarer.java; - const #17 = NameAndType #10:#11;// "<init>":()V - const #18 = NameAndType #23:#24;// getGlobalId:(I)I - const #19 = NameAndType #9:#8;// out:[I - const #20 = NameAndType #7:#8;// in:[I - const #21 = Asciz Squarer; - const #22 = Asciz com/amd/aparapi/Kernel; - const #23 = Asciz getGlobalId; - const #24 = Asciz (I)I; - - { - int[] in; - - int[] out; - - public Squarer(); - Code: - Stack=1, Locals=1, Args_size=1 - 0: aload_0 - 1: invokespecial #1; //Method com/amd/aparapi/Kernel."<init>":()V - 4: return - - - public void run(); - Code: - Stack=5, Locals=2, Args_size=1 - 0: aload_0 - 1: iconst_0 - 2: invokevirtual #2; //Method getGlobalId:(I)I - 5: istore_1 - 6: aload_0 - 7: getfield #3; //Field out:[I - 10: iload_1 - 11: aload_0 - 12: getfield #4; //Field in:[I - 15: iload_1 - 16: iaload - 17: aload_0 - 18: getfield #4; //Field in:[I - 21: iload_1 - 22: iaload - 23: imul - 24: iastore - 25: return - } - -Here we see constant pool of the class and the disassembled bytecode of the default constructor Squarer() and the Squarer.run() method. - -The constant pool is a table of constant values that can be accessed from the bytecode of any methods from within this class. Some of the constants are String literals defined within the source (or literals used to name classes, fields, methods, variables or signatures), other slots represent Classes, Methods, Fields or Type signatures. These later constant pool entries cross-reference other constant pool entries to describe higher level artifact. - -For example constant pool entry #1 is - - const #1 = Method #6.#17; // com/amd/aparapi/Kernel."<init>":()V - -So entry #1 defines a method. The class containing the method is defined in constant pool entry #6. So lets look at constant pool entry #6. - - const #1 = Method #6.#17; // com/amd/aparapi/Kernel."<init>":()V - - const #6 = class #22; // com/amd/aparapi/Kernel - -At constant pool entry #6 we find a class definition which refers to entry #22 - - const #1 = Method #6.#17; // com/amd/aparapi/Kernel."<init>":()V - - const #6 = class #22; // com/amd/aparapi/Kernel - - const #22 = Asciz com/amd/aparapi/Kernel; - -Which just contains the String (Ascii) name of the class. - -Looking back at entry #1 again, we note that the Method also references entry #17 which contains a NameAndType entry for determining the method name and the signature. - - const #1 = Method #6.#17; // com/amd/aparapi/Kernel."<init>":()V - - const #6 = class #22; // com/amd/aparapi/Kernel - - - const #17 = NameAndType #10:#11;// "<init>":()V - - const #22 = Asciz com/amd/aparapi/Kernel; - -Entry #17's "NameAndType" references #10 for the method name. - - const #1 = Method #6.#17; // com/amd/aparapi/Kernel."<init>":()V - - const #6 = class #22; // com/amd/aparapi/Kernel - - const #10 = Asciz <init>; - - const #17 = NameAndType #10:#11;// "<init>":()V - - const #22 = Asciz com/amd/aparapi/Kernel; - -And then references #11 to get the signature. - - const #1 = Method #6.#17; // com/amd/aparapi/Kernel."<init>":()V - - const #6 = class #22; // com/amd/aparapi/Kernel - - const #10 = Asciz <init>; - - const #11 = Asciz ()V; - - const #17 = NameAndType #10:#11;// "<init>":()V - - const #22 = Asciz com/amd/aparapi/Kernel; - -So from constant pool #1 we ended up using slots 1,6,10,11,17 and 22 to fully resolve the method. - -This looks like a lot of work, however by breaking method and field references up like this, allows the various slots to be reused by other field/method descriptions. - -So when we see disassembled bytecode which references a constantpool slot the actual slot # (2 in the example below) will appear after the bytecode for invokevirtual. - - 2: invokevirtual #2; Method getGlobalId:(I)I - -Bytecode is basically able to access three things - -1. Constant pool entries -2. Variable slots -3. Stack operands - -Instructions are able to pop operands from the stack, push operands to the stack, load values from variable slots (to the stack), store values (from the stack) to variable slots, store values from accessed fields (to the stack) and call methods (popping args from the stack). - -Some instructions can only handle specific types (int, float, double, and object instances - arrays are special forms of objects) and usually the first character of the instruction helps determine which type the instruction acts upon. So imul would be a multiply instruction that operates on integers, fmul would multiply two floats, dmul for doubles. Instructions that begin with 'a' operate on object instances. - -So lets look at the first instruction. - - 0: aload_0 - -This instruction loads an object (a is the first character) from variable slot 0 (we'll come back to the variable slots in a moment) and pushes it on the stack. - -Variables are held in 'slots' that are reserved at compiled time. - -Consider this static method. - - static int squareMe(int value){ - value += value; - return(value); - } - -This method requires one variable slot. At any one time there is only one variable that is live, it just happens to be an argument to the method. - -The following method also contains one slot. - - static int squareMe(){ - int value=4; - value += value; - return(value); - } - -Here we need two slots - - static int squareMe(int arg){ - int value=arg*arg; - return(value); - } - -Suprisingly the following also only requires two slots. - - static int squareMe(int arg){ - { - int temp = arg*arg; - } - int value=arg*arg; - return(value); - } - -Note that in the above example the temp variable loses scope before the local variable value is used. So only two slots are required. Both temp and value can share a slot. - -If we have an instance method we always require one extra slot (always slot 0) for the this reference. - -So - - int squareMe(int arg){ - int value=arg*arg; - return(value); - } - -Requires three slots. - -Anyway back to our bytecode - - 0: aload_0 - -This loads the object instance in slot 0 (this) and pushes it on the stack. - -Next we have - - 1: iconst_0 - -Which pushes the int constant 0 on the stack. So the stack contains {this,0} - -Next we have - - 2: invokevirtual #2; //Method getGlobalId:(I)I - -This is the bytecode for calling a method. Basically the instruction itself references the constant pool (we'll come back to this ;) ) and pulls the method description in `constantPool2` which happens to be the description for a method called `getGlobalId()` which takes an integer and returns an `int`. - -So the VM will pop the top value `(int - const 0)` as the method arg, and then will pop an object reference (this!) and will call the method `this.getGlobalId(0)` and will push the result (an int) back on the stack. - -So our stack which contains `{this,0}` now contains the result of this.getGlobalId(0), lets assume it is {0}. We describe this invoke instruction as consuming two operands from the stack and producing one. - -Before we start executing our stack is empty {}, the slots are initialized with 'this' (if an instance method) and any arguments passed to the method. - - 0 1 - slots=[this, ? ] stack={} - - 0 1 - 0: aload_0 slots=[this, ? ] stack={this} - 0 1 - 1: iconst_0 slots=[this, ? ] stack={this, 0} - 0 1 - 2: invokevirtual #2; Method getGlobalId:(I)I slots=[this, ? ] stack={result of this.getGlobalId(0) lets say 0} - - 5: istore_1 slots=[this, 0 ] stack={} - - 6: aload_0 slots=[this, 0 ] stack={this} - - 7: getfield #3; //Field out:[I diff --git a/doc/DevelopersGuide.md b/doc/DevelopersGuide.md deleted file mode 100644 index 350226f8b262c3aacb631debc0b2042769d92d5c..0000000000000000000000000000000000000000 --- a/doc/DevelopersGuide.md +++ /dev/null @@ -1,29 +0,0 @@ -#DevelopersGuide -*Aparapi developers guide. Updated Sep 13, 2011 by frost.g...@gmail.com* -##Developer Guide -Although the vast majority of the Aparapi code is Java® we do include some to C++ code (accessed from Javaâ„¢ via JNI) to interface with existing OpenCLâ„¢ C/C++ headers and libraries. Therefore to build Aparapi for a given platform (Microsoft® Windows® 32- or 64- bit and or Linux® 32- or 64- bit) we do require developers to setup a build environment containing both Java® and C++ development tools. In this documentation we will describe the tools required to build Aparapi for the various supported platforms. - -##Supported Platforms -In general Aparapi can be used on any platform currently supported by AMD APP SDK v2.5 or later. Please check the AMD APP SDK site for details on supported platforms and installation help. - -[http://developer.amd.com/sdks/amdappsdk/downloads/pages/default.aspx](http://developer.amd.com/sdks/amdappsdk/downloads/pages/default.aspx) - -[http://developer.amd.com/sdks/AMDAPPSDK/assets/AMD_APP_SDK_Installation_Notes.pdf](http://developer.amd.com/sdks/amdappsdk/downloads/pages/default.aspx) - -* 32-bit Microsoft® Windows® 7 -* 32-bit Microsoft® Windows Vista® -* 64-bit Microsoft® Windows® 7 -* 64-bit Microsoft® Windows Vista® -* 32-bit Linux® -* 64-bit Linux® - -Clearly we will also depend on platform specific Oracle® Java® JDK 6 components and C++ compilers along with some platform neutral tools (such as SVN, ant and Junit) . - -## Platform Specific Developer Guides -We have broken the Developer Guide into two separate docs. One for Linux® (32- and 64- bit) and another for Microsoft® Windows® (32- and 64- bit). Please follow the appropriate link below. - -[DevelopersGuideLinux](DevelopersGuideLinux.md) - -[DevelopersGuideWindows](DevelopersGuideWindows.md) - -Attribution \ No newline at end of file diff --git a/doc/DevelopersGuideLinux.md b/doc/DevelopersGuideLinux.md deleted file mode 100644 index 3a8e77869dafed0712833a49dbf34e2fd94ffc50..0000000000000000000000000000000000000000 --- a/doc/DevelopersGuideLinux.md +++ /dev/null @@ -1,181 +0,0 @@ -#DevelopersGuideLinux - -*Developer guide for Linux. Updated Aug 23, 2012 by frost.g...@gmail.com* - -#Aparapi Developer Guide: Linux® 32- and 64-bit platforms - -##SVN Client - -To contribute to Aparapi you will need an SVN client to access the latest source code. This page lists a number of SVN client providers [http://subversion.apache.org/packages.html](http://subversion.apache.org/packages.html) Also you might want to consider one of the SVN-based plugins for Eclipse®. http://wiki.eclipse.org/SVN_Howto -OpenJDK or Oracle® Java JDK install (JDK1.6 or later) - -http://OpenJDK.java.net http://www.oracle.com/technetwork/java/javase/downloads/index.html - -Many Linux® distributions come with Java JDK pre-installed or available as an optional install component. Sometimes the version that comes pre-installed is GCJ (http://gcc.gnu.org/java/). For Aparapi you will need to ensure that you have a copy of the JDK from either the OpenJDK project or from Oracle®. - -The Oracle® J2SE JDK site contains downloads and documentation showing how to install for various Linux distributions. - -http://www.oracle.com/technetwork/java/javase/index-137561.html - -Here is an example for my Ubuntu system: - - $ sudo apt-get install sun-java6-jdk sun-java6-jre - -When the installation is complete, ensure that your JAVA_HOME environment variable is pointing to the install location (such as /usr/lib/jvm/java-6-sun-1.6.0.26). - - $ export JAVA_HOME=/usr/lib/jvm/java-6-sun-1.6.0.26 - -You should also add ${JAVA_HOME}/bin to your path. - - $ export PATH=$PATH}:${JAVA_HOME}/bin - -Double-check your path and ensure that there is not another JDK/JRE in your path. - - $ java -version - java version "1.6.0_26" - Java(TM) SE Runtime Environment (build 1.6.0_26-b03) - Java HotSpot(TM) Client VM (build 20.1-b02, mixed mode, sharing) - -##Apache Ant - -Apache Ant® can be downloaded from the apache project page http://ant.apache.org - -Aparapi has been tested using 1.7.1 version of Ant. It may work with earlier versions, but if you encounter issues we recommend updating to at least 1.7.1 before reporting issues. Here is an example for installing Ant on Ubuntu : - - $ apt-get install ant - -Ensure that ANT_HOME is set to the install dir. - - $ export ANT_HOME=/usr/local/ant - -Add `${ANT_HOME}/bin` to your path. - - $ export PATH=$PATH}:${ANT_HOME}/bin - -Double-check the installation and environment vars. - - ant -version - Apache Ant version 1.7.1 compiled ... - -##AMD APP SDK - -To compile Aparapi JNI code you need access to OpenCL headers and libraries. The instructions below assume that there is an available AMD APP SDK v2.5® (or later) installed and that your platform supports the required device drivers for your GPU card. Install the Catalyst driver first, and then install AMD APP SDK v2.5® or later. - -See http://developer.amd.com/sdks/AMDAPPSDK/pages/DriverCompatibility.aspx for help locating the appropriate driver for your AMD card. Make sure you install the catalyst driver that includes the OpenCLâ„¢ runtime components. - - The OpenCLâ„¢ runtime is required for executing Aparapi or OpenCLâ„¢ on your GPU or GPU, but it is not necessary for building/compiling Aparapi. - The AMD APP SDK v2.5 is necessary for compiling the Aparapi JNI code against OpenCLâ„¢ APIs. - -Once you have a suitable driver, download a copy of AMD APP SDK v2.5 or later from http://developer.amd.com/sdks/AMDAPPSDK/downloads/Pages/default.aspx. - -Download the installation guide for Microsoft® Windows® (and Linux®) from http://developer.amd.com/sdks/AMDAPPSDK/assets/AMD_APP_SDK_Installation_Notes.pdf. Note that if you updating from a previous version of AMD APP SDK (or its predecessor ATI STREAM SDK), first uninstall the previous version. - -Download the release notes from: http://developer.amd.com/sdks/AMDAPPSDK/assets/AMD_APP_SDK_Release_Notes_Developer.pdf -GCC compiler (G++) for your Linux 32-bit or 64-bit platform - -Aparapi has been tested with 32-bit and 64-bit Linux 4.1.2 or later GCC compilers. - -Ensure you have the g++ toolchain installed: - - $ g++ - no input files - -##JUnit - -The initial Open Source drop includes a suite of JUnit tests for validating bytecode to OpenCLâ„¢ code generation. These tests require JUnit 4. - -Download JUnit from http://www.junit.org/ and note the location of your JUnit installation; the location is needed to configure the test\codegen\build.xml file. Please see the UnitTestGuide page. - -##Eclipse - -Eclipse is not required to build Aparapi; however, the developers of Aparapi do use Eclipse and have made the Eclipse artifacts (.classpath and .project files) available so that projects can be imported into Eclipse. The com.syncleus.aparapi.jni subproject (containing C++ JNI source) should be imported as a resource project. We do not recommend importing com.syncleus.aparapi.jni as a CDT project, and we do not recommend trying to configure a CDT build, the existing build.xml files has been customized for multiplatform C++ compilations. - -##Building - -Check out the Aparapi SVN trunk: - - $ svn checkout http://aparapi.googlecode.com/svn/trunk aparapi - -Checkout provides the following: - - aparapi/ - com.syncleus.aparapi/ - src/java/com.syncleus.aparapi/*.java - build.xml - com.syncleus.aparapi.jni/ - src/cpp/*.cpp - src/cpp/*.h - build.xml - test/ - codegen/ - src/java/ - com.syncleus.aparapi/ - com.syncleus.aparapi.test/ - build.xml - runtime/ - src/java/ - com.syncleus.aparapi/ - com.syncleus.aparapi.test/ - build.xml - samples/ - mandel - src/java/com.syncleus.aparapi.samples.mandel/*.java - build.xml - mandel.sh - mandel.bat - squares/ - src/java/com.syncleus.aparapi.samples.squares/*.java - build.xml - squares.sh - squares.bat - convolution/ - src/java/com.syncleus.aparapi.samples.convolution/*.java - build.xml - conv.sh - conv.bat - examples/ - nbody/ - src/java/com.syncleus.aparapi.nbody/ - build.xml - nbody.sh - nbody.bat - build.xml - README.txt - LICENSE.txt - CREDITS.txt - -##Sub Directories - -The com.syncleus.aparapi and com.syncleus.aparapi.jni subdirectories contain the source for building and using Aparapi. - -The ant build.xml file, in each folder accept common 'clean' and 'build' targets. You can use the build.xml file at the root of the tree for two purposes: - - To initiate a build com.syncleus.aparapi of com.syncleus.aparapi.jni. - To create a binary ‘distribution’ directory and zip file. This zip file is same as those available from the download section of the code.google.com/p/aparapi site. - -##Preparing for your first build - -Edit com.syncleus.aparapi.jni\build.properties and ensure that the properties are valid for your platform. - -View the comments in the properties file for assistance. The build.xml ant file contains some simple checks to help diagnose simple configuration errors in case something gets messed up. - -For Linux you should not need to edit build.xml unless your APP SDK install location differs from the default. The default for Linux® is /opt/AMDAPP - - amd.app.sdk.dir=/opt/AMDAPP - -Perform a build from the root directory using the following command: - - $ ant clean build dist - -Once your build has completed you should see an additional subdirectory named dist_linux_x86 or dist_linux_x86_64 (depending on the bitness of your platform). - -The distribution directory contains: - - aparapi.jar containing Aparapi classes for all platforms. - the shared library for your platform (aparapi_x86.so or aparapi_x86_64.so). - an /api subdirectory containing the 'public' javadoc for Aparapi. - a samples directory containing the source and binaries for the mandel and squares sample projects. - -The root directory also contains either dist_linux_x86_64.zip or dist_linux_x86.zip containing a compressed archive of the distribution tree. - -[Attribution](Attribution.md) diff --git a/doc/DevelopersGuideWindows.md b/doc/DevelopersGuideWindows.md deleted file mode 100644 index d03e70f74f094aac5789c3e8ab7a39a5ed112c18..0000000000000000000000000000000000000000 --- a/doc/DevelopersGuideWindows.md +++ /dev/null @@ -1,187 +0,0 @@ -#DevelopersGuideWindows -*Developers guide for Windows. Updated Aug 23, 2012 by frost.g...@gmail.com* - -##Aparapi Developer Guide: Microsoft® Windows® 32- and 64-bit platforms - -##SVN Client - -To contribute to Aparapi you will need an SVN client to access the latest source code. - -This page lists a number of SVN client providers http://subversion.apache.org/packages.html - -For Microsoft Windows® users TortoiseSVN incorporates SVN functionality directly into Windows Explorer view and is often preferred http://tortoisesvn.tigris.org/ - -Also you might want to consider one of the SVN-based plugins for Eclipse. http://wiki.eclipse.org/SVN_Howto -Oracle® Java JDK install (JDK1.6 or later) - -http://www.oracle.com/technetwork/java/javase/downloads/index.html - -The Oracle® J2SE JDK site contains downloads and documentation showing how to install for various platforms. http://www.oracle.com/technetwork/java/javase/index-137561.html - -When the installation is complete, ensure that your JAVA_HOME environment variable is pointing to the install location (such as c:\progra~1\java\jdk1.6.0_26)and that %JAVA_HOME%\bin is in your path. - - C:> set JAVA_HOME=c:\progra~1\java\jdk1.6.0_26 - C:> set PATH=%PATH%;%JAVA_HOME%\bin - -Note that we tend to use the 8.3 form of Microsoft® Windows® path variables this avoids us having to quote paths in scripts. - -Double check your path and ensure that there is not another JDK/JRE in your path. - - C:> java -version - java version "1.6.0_26" - Java(TM) SE Runtime Environment (build 1.6.0_26-b03) - Java HotSpot(TM) Client VM (build 20.1-b02, mixed mode, sharing) - -##Apache Ant - -Apache Antâ„¢ can be downloaded from the apache project page http://ant.apache.org - -Aparapi has been tested using 1.7.1 version of Ant, it may well work with earlier versions, but if you encounter issues we recommend updating to at least 1.7.1 before reporting issues. Installation is straightforward, just unzip the ant.zip file and ensure that your ANT_HOME}} environment variable is pointing to your ANT installation and that `{{{%ANT_HOME%\bin` is in your path. - - C:> set ANT_HOME=C:\progra~1\apache\apache-ant-1.8.1 - C:> set PATH=%PATH%;%ANT_HOME%\bin - -Double check the installation and environment vars. - - ant -version - Apache Ant version 1.7.1 compiled .. - -##AMD APP SDK - -To compile Aparapi JNI code you need access to OpenCL headers and libraries. The instructions below assume that there is an available AMD APP SDK v2.5 (or later) installed and that your platform supports the required device drivers for your GPU card. Install the Catalyst driver first, and then install AMD APP SDK v2.5. - -See http://developer.amd.com/sdks/AMDAPPSDK/pages/DriverCompatibility.aspx for help locating the appropriate driver for your AMD card. Be sure you obtain the catalyst driver that includes the OpenCLâ„¢ runtime components. - - The OpenCLâ„¢ runtime is required for executing Aparapi or OpenCLâ„¢ on your CPU or GPU, but it is not necessary for building/compiling Aparapi. - The AMD APP SDK v2.5 is necessary for compiling the Aparapi JNI code against OpenCLâ„¢ APIs. - -Once you have a suitable driver, download a copy of AMD APP SDK v2.5 from http://developer.amd.com/sdks/AMDAPPSDK/downloads/Pages/default.aspx. - -Download the installation guide for Microsoft® Windows® (and Linux®) from http://developer.amd.com/sdks/AMDAPPSDK/assets/AMD_APP_SDK_Installation_Notes.pdf. Note that if you updating from a previous version of AMD APP SDK (or its predecessor ATI STREAM SDK), first uninstall the previous version. The release notes are available here http://developer.amd.com/sdks/AMDAPPSDK/assets/AMD_APP_SDK_Release_Notes_Developer.pdf -##A C++ compiler - -For Microsoft® Windows® platforms the JNI build can support either Microsoft® Visual Studio® 2008, 2009 or 2010 compiler or MinGW (Minimal GNU for Windows) from GNU. Now that Visual Studio express is available for free, we would recommend using Visual studio. If you wish to use another compiler then you will have to tweak the com.syncleus.aparapi.jni/build.xml file to get your compiler to work. -Microsoft® Visual Studio® 2008/2010 for 32-bit or 64-bit platforms - -Aparapi has been tested with various versions of Microsoft® Visual Studio® 2008, 2009 and 2010 including Enterprise, Professional and Express editions, if you encounter any version specific issues please let us know so we can address it and/or update this documentation. - -If you already have Microsoft® Visual Studio® installed you will need to know the location of the compiler and the SDK. These can vary depending upon the platform and version you are using. Typically an install results in a Visual Studio install, such as. c:\Program Files\Microsoft Visual Studio 9.0 - -And an SDK, such as. c:\Program Files\Microsoft SDKs\Windows\v6.0A - -Note the location of both of these as this information will be needed to configure the com.syncleus.aparapi.jni\build.property file (later). -For Visual Studio Express 64 bit users - -Visual studio express does not include the 64 bit compiler or libraries. You will need to also install the SDK from Microsoft. this link should help -##MinGW – (MINimum Gnu for Windows) - -As an alternative to installing Microsoft® Visual Studio® we have included support for the MinGW tool chain and Aparapi has been (minimally) tested with this compiler. - -MingGW can be downloaded from http://www.mingw.org/ by following the instructions on their Getting Started page. We recommend installing the mingw-get-inst msi installer and just taking the defaults. - -Note the install location as this information will be needed to edit build.xml file and uncomment the line referencing the mingw instal dir. Typically the install location is - - C:\MinGW - -After a successful build, you will need to ensure that the bin sub directory is in your path before you attempting to run an Aparapi enabled application built using MinGW. MinGW apps require access to MingGW/GNU C++/C runtime at execution time. - - set PATH=%PATH%;C:\MinGW\bin - -This is one reason the binary distribution is ''not'' built using mingw. -##JUnit - -The initial Open Source drop includes a suite of JUnit tests for validating bytecode to OpenCL code generation. These tests require JUnit 4. - -Download JUnit from http://www.junit.org/ - -Note the location of your JUnit installation; the location is needed to configure the test\codegen\build.xml file. See the UnitTestGuide page for howto configure the JUnit build. -##Eclipse - -Eclipse is not required to build Aparapi, however the developers of Aparapi do use Eclipse and have made the Eclipse artifacts (.classpath and .project files) available so that projects can be imported into Eclipse. - -The com.syncleus.aparapi.jni subproject (containing C++ JNI source) should be imported as a resource project, we do not recommend importing com.syncleus.aparapi.jni as a CDT project, and we do not recommend trying to configure a CDT build, the existing build.xml files has been customized for multiplatform C++ compilations. -##Building - -Check out the Aparapi SVN trunk: - -svn checkout http://aparapi.googlecode.com/svn/trunk - -You will end up with the following files/directories - - aparapi/ - com.syncleus.aparapi/ - src/java/com.syncleus.aparapi/*.java - build.xml - com.syncleus.aparapi.jni/ - src/cpp/*.cpp - src/cpp/*.h - build.xml - test/ - codegen/ - src/java/ - com.syncleus.aparapi/ - com.syncleus.aparapi.test/ - build.xml - runtime/ - src/java/ - com.syncleus.aparapi/ - com.syncleus.aparapi.test/ - build.xml - samples/ - mandel - src/java/com.syncleus.aparapi.samples.mandel/*.java - build.xml - mandel.sh - mandel.bat - squares/ - src/java/com.syncleus.aparapi.samples.squares/*.java - build.xml - squares.sh - squares.bat - convolution/ - src/java/com.syncleus.aparapi.samples.convolution/*.java - build.xml - conv.sh - conv.bat - examples/ - nbody/ - src/java/com.syncleus.aparapi.nbody/ - build.xml - nbody.sh - nbody.bat - build.xml - README.txt - LICENSE.txt - CREDITS.txt - -##Sub Directories - -The com.syncleus.aparapi and com.syncleus.aparapi.jni subdirectories contain the source for building and using Aparapi. - -The ant build.xml file, in each folder accept 'clean' and 'build' targets. - -Use the build.xml file at the root of the tree for two purposes: - - To initiate a build of com.syncleus.aparapi and com.syncleus.aparapi.jni. - To create a binary distribution directory and zip file. This zip file is same as those available from the download section of the code.google.com/p/aparapi site. - -##Preparing for your first build - -You should only need to edit com.syncleus.aparapi.jni\build.xml file if you wish to use mingw or if you Visual Studio or gcc compiler is in an unusual place. - -Perform a build from the root directory using the following command: - - $ ant clean dist - -The jni build will perform some simple tests to check the configuration properties and hopefully also guide you to a possible solution. - -Once your build has completed you should see an additional subdirectory named dist_windows_x86 or dist_windows_x86_64 (depending upon your platform type). - - aparapi.jar containing Aparapi classes for all platforms. - the shared library for your platform (aparapi_x86.dll or aparapi_x86_64.dll). - an /api subdirectory containing the 'public' javadoc for Aparapi. - a samples directory containing the source and binaries for the mandel and squares sample projects. - -The root directory also contains either dist_windows_x86_64.zip or dist_windows_x86.zip containing a compressed archive of the distribution tree. - -[Attribution](Attribution.md) diff --git a/doc/DeviceProposal.md b/doc/DeviceProposal.md deleted file mode 100644 index cb91759b5e4a08f8e380941dcba5c0c1829b4b76..0000000000000000000000000000000000000000 --- a/doc/DeviceProposal.md +++ /dev/null @@ -1,65 +0,0 @@ -#DeviceProposal -*How we might use the extension mechanism devices for general Kernel execution. Updated May 9, 2012 by frost.g...@gmail.com* - -At present the first GPU or CPU device (depending on Kernel.ExecutionMode value) is chosen at execution time. This make it easy to execute simple Kernels, but is problematic when using some advanced feature (barriers, local memory) or for sizing buffers appropriate for the target device. I propose that we add API's to allow the developer to specify exactly which device we intend to target. - -In the extension proposal branch we needed to expose a Device class for binding arbitrary OpenCL to a Java interface. I suggest we also be use this to query device information useful for allocating suitable size global buffers/local buffers, and for dispatching Kernel's to specific devices. - -The general pattern would be that we ask Aparapi to give us a Device, probably via a Device factory method. - -Something like:- - - Device device = Device.best(); -We would also offer other useful factory methods `getBestGPU(), getFirstCPU() getJavaMultiThread(), getJavaSequential()` as well as a method to get all device so that the developer can filter themselves. - -Note that as well as real OpenCL devices we also expose 'pseudo' devices such as JavaMultiThread and Sequential. We might also allow pseudo devices to group multiple devices. So getAllGPUDevices() might return a pseudo device for executing across devices. - - Device chosen=null; - for (Device device: devices.getAll()){ - if (device.getVendor().contains("AMD") && device.isGPU()){ - chosen = device; - break; - } - } - -A Device can be queried `(isGPU(), isOpenCL(), isGroup(), isJava(), getOpenCLPlatform(), getMaxMemory(), getLocalSizes())` and may need to be cast to specific types. - -This would allow us to configure buffers. - - Device device = Device.best(); - if (device instanceof OpenCLDevice){ - OpenCLDevice openCLDevice = (OpenCLDevice)device; - char input[] = new char[openCLDevice.getMaxMemory()/4); - } -We can also use the Device as a factory for creating Ranges. - - Range range = device.createRange2D(width, height); -This allows the Range to be created with knowledge of the underlying device. So for example `device.createRange3D(1024, 1024, 1024, 16, 16, 16)` will fail if the device does not allow a local size of (16x16x16). - -A range created using `device.createRangeXX()` would also capture the device that created it. As if we had - - Range range = device.createRange2D(width, height); - // implied range.setDevice(device); - This basically means that the Range locks the device that it can be used with. - - So when we have a Kernel. - - Kernel kernel = new Kernel(){ - @Override public void run(){ - ... - } - } -And we then use - - Device device = Device.firstGPU(); - final char input[] = new char[((OpenCLDevice)device).getMaxMemory()/4); - Kernel kernel = new Kernel(){ - @Override public void run(){ - // uses input[]; - } - }; - range = device.createRange2D(1024, 1024); - kernel.execute(range); -We have forced execution on the first GPU. Java fallback would still be possible (should we forbid this?). - - kernel.execute( Device.firstGPU().getRange2D(width, height)); diff --git a/doc/EmulatingMultipleEntrypointsUsingCurrentAPI.md b/doc/EmulatingMultipleEntrypointsUsingCurrentAPI.md deleted file mode 100644 index b34051f5aadc8ba235098cbc088ce97eaa266d5d..0000000000000000000000000000000000000000 --- a/doc/EmulatingMultipleEntrypointsUsingCurrentAPI.md +++ /dev/null @@ -1,226 +0,0 @@ -#EmulatingMultipleEntrypointsUsingCurrentAPI -*How to emulate multiple entrypoints using existing Aparapi APIs Updated Jul 30, 2012 by frost.g...@gmail.com* - -##Emulating Multiple Entrypoints Using Existing Aparapi APIs - -Until we have support for multiple entrypoints in Aparapi, there are some tricks for emulating this feature. - -Follow the proposal for adding multiple entrypoints on this page [MultipleEntryPointSupportProposal](MultipleEntryPointSupportProposal.md). - -Suppose we wanted to create a general VectorMath kernel which might expose unary square, squareroot methods and binary addition and subtraction functionality. With our current API limitations we can't easily do this, we can approximate having separate methods by passing a separate arg to dictate the 'function' that we wish to perform. - - class VectorKernel extends Kernel{ - float[] lhsOperand; - float[] rhsOperand; - float[] unaryOperand; - float[] result; - final static int FUNC_ADD =0; - final static int FUNC_SUB =1; - final static int FUNC_SQR =2; - final static int FUNC_SQRT =3; - // other functions - int function; - @Override public void run(){ - int gid = getGlobalId(0){ - if (function==FUNC_ADD){ - result[gid]=lhsOperand[gid]+rhsOperand[gid]; - }else if (function==FUNC_SUB){ - result[gid]=lhsOperand[gid]-rhsOperand[gid]; - }else if (function==FUNC_SQR){ - result[gid]=unaryOperand[gid]*unaryOperand[gid]; - }else if (function==FUNC_ADD){ - result[gid]=sqrt(unaryOperand[gid]); - }else if .... - } - } - -To use this for adding two vectors and then take the sqrt of the result we would use something like.... - - int SIZE=1024; - Range range = Range.create(SIZE); - VectorKernel vk = new VectorKernel(); - vk.lhsOperand = new float[SIZE]; - vk.rhsOperand = new float[SIZE]; - vk.unaryOperand = new float[SIZE]; - vk.result = new float[SIZE]; - - // fill lhsOperand ommitted - // fill rhsOperand ommitted - vk.function = VectorKernel.FUNC_ADD; - vk.execute(range); - System.arrayCopy(vk.result, 0, vk.unaryOperand, 0, SIZE); - vk.function = VectorKernel.FUNC_SQRT; - vk.execute(range); - -This approach is fairly common and I have used it successfully to perform various pipeline stages for calculating FFT's for example. Whilst this is functional it is not a great solution. First the API is clumsy. We have to mutate the state of the kernel instance and then re-arrange the arrays manually to chain math operations. We could of course hide all of this behind helper methods. One could imagine for example an implementation which exposes helper add(lhs, rhs)}}, or {{{sqrt() which hid all the nasty stuff. - - class VectorKernel extends Kernel{ - float[] lhsOperand; - float[] rhsOperand; - float[] unaryOperand; - float[] result; - final static int FUNC_ADD =0; - final static int FUNC_SUB =1; - final static int FUNC_SQR =2; - final static int FUNC_SQRT =3; - // other functions - int function; - @Override public void run(){ - int gid = getGlobalId(0){ - if (function==FUNC_ADD){ - result[gid]=lhsOperand[gid]+rhsOperand[gid]; - }else if (function==FUNC_SUB){ - result[gid]=lhsOperand[gid]-rhsOperand[gid]; - }else if (function==FUNC_SQR){ - result[gid]=unaryOperand[gid]*unaryOperand[gid]; - }else if (function==FUNC_ADD){ - result[gid]=sqrt(unaryOperand[gid]); - }else if .... - } - private void binary(int operator, float[] lhs, float[] rhs){ - lhsOperand = lhs; - rhsOperand = rhs; - function=operator; - execute(lhs.length()); - } - public void add(float[] lhs, float[] rhs){ - binary(FUNC_ADD, lhs, rhs); - } - - public void sub(float[] lhs, float[] rhs){ - binary(FUNC_SUB, lhs, rhs); - } - - private void binary(int operator, float[] rhs){ - System.arrayCopy(result, 0, lhsOperand, result.length); - rhsOperand = rhs; - function=operator; - execute(lhsOperand.legth()); - } - - public void add(float[] rhs){ - binary(FUNC_ADD, rhs); - } - - public void sub( float[] rhs){ - binary(FUNC_SUB, rhs); - } - - private void unary(int operator, float[] unary){ - unaryOperand = unary; - function=operator; - execute(unaryOperand.length()); - } - - public void sqrt(float[] unary){ - unary(FUNC_SQRT, unary); - } - - private void unary(int operator){ - System.array.copy(result, 0, unaryOperand, 0, result.length); - function=operator; - execute(unaryOperand.length()); - } - - public void sqrt(){ - unary(FUNC_SQRT); - } - - } - - VectorKernel vk = new VectorKernel(SIZE); - vk.add(copyLhs, copyRhs); // copies args to lhs and rhs operands - // sets function type - // and executes kernel - vk.sqrt(); // because we have no arg - // copies result to unary operand - // sets function type - // execute kernel - -However there is one more objection to this approach, namely that it by default will force unnecessarily buffer copies. - -When the bytecode for the above Kernel.run() method is analyzed Aparapi finds bytecode reading from lhsOperand, rhsOperand and unaryOperand arrays/buffers. Obviously at this bytecode analysis stage we can't predict which 'function type' will be used, so on every executions (Kernel.run()) Aparapi must copy all three buffers to the GPU. For binary operations this is one buffer copy wasted (the unaryOperand), for the unary operations we copy two buffers unnecessarily (lhsOperand and rhsOperand). We can of course use explicit buffer management to help us reduce these costs. Ideally we add this to our helper methods. - - class VectorKernel extends Kernel{ - float[] lhsOperand; - float[] rhsOperand; - float[] unaryOperand; - float[] result; - final static int FUNC_ADD =0; - final static int FUNC_SUB =1; - final static int FUNC_SQR =2; - final static int FUNC_SQRT =3; - // other functions - int function; - @Override public void run(){ - int gid = getGlobalId(0){ - if (function==FUNC_ADD){ - result[gid]=lhsOperand[gid]+rhsOperand[gid]; - }else if (function==FUNC_SUB){ - result[gid]=lhsOperand[gid]-rhsOperand[gid]; - }else if (function==FUNC_SQR){ - result[gid]=unaryOperand[gid]*unaryOperand[gid]; - }else if (function==FUNC_ADD){ - result[gid]=sqrt(unaryOperand[gid]); - }else if .... - } - private void binary(int operator, float[] lhs, float[] rhs){ - lhsOperand = lhs; - rhsOperand = rhs; - function=operator; - put(lhsOperand).put(rhsOperand); - execute(lhs.length()); - get(result); - } - public void add(float[] lhs, float[] rhs){ - binary(FUNC_ADD, lhs, rhs); - } - - public void sub(float[] lhs, float[] rhs){ - binary(FUNC_SUB, lhs, rhs); - } - - private void binary(int operator, float[] rhs){ - System.arrayCopy(result, 0, lhsOperand, result.length); - rhsOperand = rhs; - function=operator; - put(lhsOperand).put(rhsOperand); - execute(lhsOperand.legth()); - get(result); - } - - public void add(float[] rhs){ - binary(FUNC_ADD, rhs); - } - - public void sub( float[] rhs){ - binary(FUNC_SUB, rhs); - } - - private void unary(int operator, float[] unary){ - unaryOperand = unary; - function=operator; - put(unaryOperand); - execute(unaryOperand.length()); - get(result); - } - - public void sqrt(float[] unary){ - unary(FUNC_SQRT, unary); - } - - private void unary(int operator){ - System.array.copy(result, 0, unaryOperand, 0, result.length); - function=operator; - put(unaryOperand); - execute(unaryOperand.length()); - get(result); - - } - - public void sqrt(){ - unary(FUNC_SQRT); - } - - } - diff --git a/doc/ExplicitBufferHandling.md b/doc/ExplicitBufferHandling.md deleted file mode 100644 index 5f0e70112dfda3c99d87b0e9103adcb20fec8045..0000000000000000000000000000000000000000 --- a/doc/ExplicitBufferHandling.md +++ /dev/null @@ -1,220 +0,0 @@ -#ExplicitBufferHandling -*How to minimize buffer transfers Updated Jul 24, 2012 by frost.g...@gmail.com* -Aparapi is designed to shield the Java developer from dealing with the underlying movement of data between the OpenCL host and device. Aparapi can analyze a kernel's `run()` method and run-reachable methods to determine which primitive arrays to transfer to the GPU prior to execution, and which arrays to transfer back when the GPU execution is complete. - -Generally this strategy is both clean and performant. Aparapi will attempt to just do the right thing. - -However, occasionally the following code pattern is seen. - - final int[] hugeArray = new int[HUGE]; - Kernel kernel= new Kernel(){ - ... // reads/writes hugeArray - }; - for (int loop=0; loop <MAXLOOP; loop++){ - kernel.execute(HUGE); - } - -This is a common pattern which unfortunately exposes an issue with Aparapi's normal buffer handling. - -Although Aparapi does analyze the byte code of the `Kernel.run()` method (and any method reachable from `Kernel.run()`) Aparapi has no visibility to the call site. In the above code there is no way for Aparapi to detect that that hugeArray is not modified within the for loop body. Unfortunately, Aparapi must default to being 'safe' and copy the contents of hugeArray backwards and forwards to the GPU device. - -Here we add comments to indicate where the unnecessary buffer transfers take place. - - final int[] hugeArray = new int[HUGE]; - Kernel kernel= new Kernel(){ - ... // reads/writes hugeArray - }; - for (int loop=0; loop <MAXLOOP; loop++){ - // copy hugeArray to GPU - kernel.execute(HUGE); - // copy hugeArray back from the GPU - } - -In reality hugeArray only needs to be copied to the GPU once (prior to the loop) and then once again when the loop has terminated. - -Here we use comments to indicated the 'optimal' transfers. - - final int[] hugeArray = new int[HUGE]; - Kernel kernel= new Kernel(){ - ... // reads/writes hugeArray - }; - // Ideally transfer hugeArray to GPU here - for (int loop=0; loop <MAXLOOP; loop++){ - kernel.execute(HUGE); - } - // Ideally transfer hugeArray back from GPU here - -Consider another common pattern - - final int[] hugeArray = new int[HUGE]; - final int[] done = new int[]{0}; - Kernel kernel= new Kernel(){ - ... // reads/writes hugeArray and writes to done[0] when complete - }; - done[0]=0; - while (done[0] ==0)){ - kernel.execute(HUGE); - } - -This is a common pattern in reduce stages of map-reduce type problems. Essentially the developer wants to keep executing a kernel until some condition is met. For example, this may be seen in bitonic sort implementations and various financial applications. - -From the code it can be seen that the kernel reads and writes `hugeArray[]` array and uses the single item `done[]` array to indicate some form of convergence or completion. - -As we demonstrated above, by default Aparapi will transfer `done[]` and `hugeArray[]` to and from the GPU device each time `Kernel.execute(HUGE)` is executed. - -To demonstrate which buffers are being transfered, these copies are shown as comments in the following version of the code. - - final int[] hugeArray = new int[HUGE]; - final int[] done = new int[]{0}; - Kernel kernel= new Kernel(){ - ... // reads/writes hugeArray and writes to done[0] when complete - }; - done[0]=0; - while (done[0] ==0)){ - // Send done[] to GPU - // Send hugeArray[] to GPU - kernel.execute(HUGE); - // Fetch done[] from GPU - // Fetch hugeArray[] from GPU - } - -Further analysis of the code reveals that `hugeArray[]` is not accessed by the loop containing the kernel execution, so Aparapi is performing 999 unnecessary transfers to the device and 999 unnecessary transfers back. Only two transfers of `hugeArray[]` are needed; one to move the initial data to the GPU and one to move it back after the loop terminates. - -The `done[]` array is accessed during each iteration (although never written to within the loop), so it does need to be transferred back for each return from Kernel.execute(), however, it only needs to be sent once. - -Clearly it is better to avoid unnecessary transfers, especially of large buffers like `hugeArray[]`. - -Aparapi exposes a feature which allows the developer to control these situations and explicitly manage transfers. - -To use this feature first the developer needs to 'turn on' explicit mode, using the `kernel.setExplicit(true)` method. Then the developer can request buffer/array transfers using either `kernel.put()` or `kernel.get()`. `Kernel.put()` forces a transfer to the GPU device and Kernel.get() transfers data back. - -The following code illustrates the use of these new explicit buffer management APIs. - - final int[] hugeArray = new int[HUGE]; - final int[] done = new int[]{0}; - Kernel kernel= new Kernel(){ - ... // reads/writes hugeArray and writes to done[0] when complete - }; - kernel.setExplicit(true); - done[0]=0; - kernel.put(done); - kernel.put(hugeArray); - while (done[0] ==0)){ - kernel.execute(HUGE); - kernel.get(done); - } - kernel.get(hugeArray); - -Note that marking a kernel as explicit and failing to request the appropriate transfer is a programmer error. - -We deliberately made `Kernel.put(...)`, `Kernel.get(...)` and `Kernel.execute(range)` return an instance of the executing kernel to allow these calls be chained. Some may find this fluent style API more expressive. - - final int[] hugeArray = new int[HUGE]; - final int[] done = new int[]{0}; - Kernel kernel= new Kernel(){ - ... // reads/writes hugeArray and writes to done[0] when complete - }; - kernel.setExplicit(true); - done[0]=0; - kernel.put(done).put(hugeArray); // chained puts - while (done[0] ==0)){ - kernel.execute(HUGE).get(done); // chained execute and put - } - kernel.get(hugeArray); - -An alternate approach for loops containing a single `kernel.execute(range)` call. -One variant of code which would normally suggest the use of Explicit Buffer Management can be handled differently. For cases where `Kernel.execute(range)` is the sole statement inside a loop and where the iteration count is known prior to the first iteration we offer an alternate (hopefully more elegant) way of minimizing buffer transfers. - -So for cases like:- - - final int[] hugeArray = new int[HUGE]; - Kernel kernel= new Kernel(){ - ... // reads/writes hugeArray - }; - - for (int pass=0; pass<1000; pass++){ - kernel.execute(HUGE); - } - -The developer can request that Aparapi perform the outer loop rather than coding the loop. This is achieved explicitly by passing the iteration count as the second argument to `Kernel.execute(range, iterations)`. - -Now any form of code that looks like :- - - int range = 1024; - int loopCount = 64; - for (int passId = 0; passId < loopCount; passId++){ - kernel.execute(range); - } - -Can be replaced with - - int range = 1024; - int loopCount = 64; - - kernel.execute(range, loopCount); - -Not only does this make the code more compact and avoids the use of explicit buffer management APIs, it allows Aparapi visibility to the complete loop so that Aparapi can minimize the number of transfers. Aparapi will only transfer buffers to the GPU once and transfer them back once, resulting in improved performance. - -Sometimes kernel code using this loop-pattern needs to track the current iteration number as the code passed through the outer loop. Previously we would be forced to use explicit buffer management to allow the kernel to do this. - -The code for this would have looked something like - - int range = 1024; - int loopCount = 64; - final int[] hugeArray = new int[HUGE]; - final int[] passId = new int[0]; - Kernel kernel = new Kernel(){ - @Override public void run(){ - int id=getGlobalId(); - if (passId[0] == 0){ - // perform some initialization! - } - ... // reads/writes hugeArray - } - }; - Kernel.setExplicit(true); - kernel.put(hugeArray); - for (passId[0]=0; passId[0]<loopCount; passId[0]++){ - - kernel.put(passId).execute(range); - } -In the current version of Aparapi we added `Kernel.getPassId()` to allow a Kernel to determine the current ‘pass’ through the outer loop without having to use explicit buffer management. - -So the previous code can now be written without any explicit buffer management APIs:- - - final int[] hugeArray = new int[HUGE]; - final int[] pass[] = new int[]{0}; - Kernel kernel = new Kernel(){ - @Override public void run(){ - int id = getGlobalId(); - int pass = getPassId(); - if (pass == 0){ - // perform some initialization! - } - ... // reads/writes both hugeArray - } - }; - - kernel.execute(HUGE, 1000); -One common use for Kernel.getPassId() is to avoid flipping buffers in the outer loop. - -It is common for kernels to process data from one buffer to another, and in the next invocation process the data back the other way. Now these kernels can use the passId (odd or even) to determine the direction of data transfer. - - final int[] arr1 = new int[HUGE]; - final int[] arr2 = new int[HUGE]; - Kernel kernel = new Kernel(){ - int f(int v){ … } - - @Override public void run(){ - int id = getGlobalId(); - int pass = getPassId(); - if (pass % 2 == 0){ - arr1[id] = f(arr2[id]); - }else{ - arr2[id] = f(arr1[id]); - - } - } - }; - - kernel.execute(HUGE, 1000); \ No newline at end of file diff --git a/doc/FrequentlyAskedQuestions.md b/doc/FrequentlyAskedQuestions.md deleted file mode 100644 index fc0ba8cd383c69bd811cda376202f6e05394280d..0000000000000000000000000000000000000000 --- a/doc/FrequentlyAskedQuestions.md +++ /dev/null @@ -1,134 +0,0 @@ -#FrequentlyAskedQuestions -*Frequently Asked Questions Updated Oct 17, 2012 by frost.g...@gmail.com* - -##Frequently Asked Questions - -##Why is this project called Aparapi and how is it pronounced? - -Aparapi is just a contraction of A PAR{allel} API and is pronounced (ap-per-rap-ee). - -##Does Aparapi only work with AMD graphics cards? - -No. Aparapi has been tested with AMD's OpenCL enabled drivers and devices as well as a limited set of NVidia devices and drivers on Windows, Linux and Mac OSX platforms. The minimal requirement at runtime is OpenCL 1.1. If you have a compatible OpenCL 1.1 runtime and supported devices Aparapi should work. - -Although the build is currently configured for AMD APP SDK, OpenCL is an open standard and we look forward to contributions which will allow Aparapi to be built against other OpenCL SDK's. - -Note that dll's built using AMD APP SDK will work on other platforms at runtime. So the binary builds are expected to work on all OpenCL 1.1 platforms. - -Witold Bolt has kindly supplied the patches to allow Mac OS support. The Mac OS build will run against OpenCL 1.1 and 1.0 runtimes, but we won't fix any issues reported against the OpenCL 1.0, your code may run, or may not. - -Aparapi may be used in JTP (Java Thread Pool) mode on any platform supported by Oracle®’s JDK. - -## Does Aparapi only support AMD CPUs? - -No, there is nothing restricting Aparapi to AMD CPUs. The JNI code that we use may run on any x86/x64 machine provided there is a compatible Java Virtual Machine® JVM implementation for your platform. - -##Will there be an Aparapi-like translator for .NET? - -This is still an early technology and Aparapi is currently focused on Java® enablement. There are similar projects targeting .NET (See www.tidepowerd.com) - -##How can I profile the OpenCL kernels that Aparapi generates? Can I get details on the latency of my kernel request?How do I optimize my kernel? - -AMD offers the ‘AMD APP Profiler’ which can be used to profile the kernels. With Aparapi, we recommend using the command line mode of the profiler, which is described in the release notes. Using the ‘AMD APP Profiler’ you can see how much time is taken by each kernel execution and buffer transfer. Also, in each kernel, you can get more detailed information on things like memory reads and writes, and other useful data. - -##Can I have multiple threads all using the GPU compute capabilities? - -Yes. There might be a performance impact if the device becomes a bottleneck. However, OpenCL and your GPU driver are designed to coordinate the various threads of execution. - -##Can I make method calls from the run method? - -You can generally only make calls to other methods declared in the same class as the initial run() method. Aparapi will follow this call chain to try to determine whether it can create OpenCL. If, for example, Aparapi encounters System.out.println("Hello World") ( call to a method not in the users Kernel class) it will detect this and refuse to consider the call chain as an OpenCL candidate. - -One exception to this rule allows a kernel to access or mutate the state of objects held in simple arrays via their setters/getters. For example a kernel can include :- - - out[i].setValue(in[i].getValue()*5); - -##Does Aparapi support vectorized types? - -Due to Java's lack of vector types (float4 for example) Aparapi can't directly use them. Also, due to Java's lack of operator overloading, simulating these with Java abstracts could lead to very complex and unwieldy code. - -##Is there a way I can see the generated OpenCL? - -Yes, by using adding -Dcom.syncleus.aparapi.enableShowGeneratedOpenCL=true to your command line when you start your JVM. - -##Does Aparapi support sharing buffers with JOGL? Can I exploit the features of JOGAMP/glugen? - -Rather than only supporting display-oriented compute, we are pursuing general data parallel compute. Therefore, we have chosen not to bind Aparapi too closely with JOGL. - -##What is the performance delta from handcrafted OpenCL? - -This depends heavily on the application. Although we can currently show 20x performance improvement on some compute intensive Java applications compared with the same algorithm using a Java Thread Pool a developer who is prepared to handcraft and hand-tune OpenCL and write custom host code in C/C++ is likely to see better performance than Aparapi may achieve. - -We understand that some user may use Aparapi as a gateway technology to test their Java code before porting to hand-crafted/tuned OpenCL. - -##Are you working with Project Lambda for offloading/parallelizing suitable work? - -We are following the progress of Project Lambda (currently scheduled for inclusion in Java 8) and would like to be able to leverage Lambda expression format in Aparapi, but none exists now. - -##Can I select a specific GPU if I have more than one card? - -Under review. At present, Aparapi just looks for the first AMD GPU (or APU) device. If the community has feedback on its preference, let us know. - -##Can I get the demos/samples presented at JavaOne or ADFS? - -The Squares and Mandlebrot sample code is included in the binary download of Aparapi. The NBody source is not included in the binary (because of a dependency on JOGL). We have, however, included the NBody code as an example project in the Open Source tree (code.google.com/p/aparapi) and provide details and we provide details on how to install the appropriate JOGL components. - -##Can Mersenne twister be ported as a random number function inside the kernel class? - -You can elect to implement your own Mersenne twister and use it in our own derived Kernel. - -##Does Aparapi use JNI? - -Yes, we do ship a small JNI shim to handle the host OpenCL calls. - -##How can I confirm that my code is actually executing on the GPU? - -From within the Java code itself you can query the execution mode after Kernel.execute(n) has returned. - - Kernel kernel = new Kernel(){ - @Override public void run(){ - } - } ; - kernel.execute(1024); - System.out.priintln(“Execution mode = “+kernel.getExecutionMode()); - -The above code fragment will print either ‘GPU’ if the kernel executed on the GPU or JTP if Aparapi executed the Kernel in a Java Thread Pool. - -Alternatively, setting the property –Dcom.syncleus.aparapi.enableShowExecutionModes=true when you start your JVM will cause Aparapi to automatically report the execution mode of all kernels to stdout. - -##Why does Aparapi need me to compile my code with -g? - -Aparapi extracts most of the information required to create OpenCL from the bytecode of your Kernel.run() (and run-reachable) methods. We use the debug information to re-create the original variable name and to determine the local variable scope information. - -Of course only the derived Kernel class (or accessed Objects using new Arrays of Objects feature) need to be compiled using -g. - -##Why does the Aparapi documentation suggest I use Oracle's JDK/JRE? Why can't I use any JVM/JDK? - -The documentation suggests using Oracle's JDK/JRE for coverage reasons and not as a requirement. AMD focused its testing on Oracle's JVM/JDK. - -There are two parts to this. - -1. Our bytecode to OpenCL engine is somewhat tuned to the bytecode structures created by javac supplied by Oracle®. Specifically, there are some optimizations that other javac implementation might perform that Aparapi won't recognize. Eclipse (for example) does not presently use Oracle's javac, and so we do have some experience handling Eclipse specific bytecode patterns. -2. At runtime, we piggyback on the (aptly named) sun.misc.Unsafe class, which is included in rt.jar from Oracle®. This class is useful because it helps us avoid some JNI calls by providing low level routines for accessing object field addresses (in real memory) and useful routines for Atomic operations. All accesses to 'sun.misc.Unsafe' are handled by an Aparapi class called UnsafeWrapper with the intent that this could be refactored to avoid this dependency. - -##I am using a dynamic language (Clojure, Scala, Groovy, Beanshell, etc) will I be able to use Aparapi? - -No. - -To access the bytecode for a method Aparapi needs to parse the original class file. For Java code, Aparapi can use something like `YourClass.getClassLoader().loadAsResource(YourClass.getName()+".class"))` to reload the class file bytes and parse the constant pool, attributes, fields, methods and method bytecode. - -It is unlikely that this process would work with a dynamically created class based on the presumption that dynamic languages employ some form of custom classloader to make dynamically generated bytecode available to the JVM. Therefore, it is unlikely that these classloaders would yield the classfile bytes. However, we encourage contributors to investigate opportunities here. Even if the class bytes were loadable, Aparapi would also expect debug information to be available (see previous FAQ entry). Again, this is not impossible for a dynamic language to do, indeed it would probably even be desirable as it would allow the code to be debugged using JDB compatible debugger. - -Finally, Aparapi recognizes bytecode patterns created by the javac supplied by Oracle® and it is possible that the code generated by a particular dynamic language may not be compatible with Aparapi current code analyzer. - -Therefore, at present this is unlikely to work. However, these would be excellent contributions to Aparapi. It would be great to see Aparapi being adopted by other JVM based dynamic language. - -##Why does Aparapi seems to be copying data unnecessarily back and forth between host and GPU. Can I stop Aparapi from doing this? - -Aparapi ensures that required data is moved to the GPU prior to kernel execution and returned to the appropriate array before Java execution resumes. Generally, this is what the Java user will expect. However, for some code patterns where multiple Kernel.execute() calls are made in succession (or more likely in a tight loop) Aparapi's approach may not be optimal. - -In the NewFeatures page we discuss a couple of Aparapi enhancements which will developers to elect intervene to reduce unnecessary copies. - -##Do I have to refactor my code to use arrays of primitives? Why can’t Aparapi just work with Java Objects? - -Aparapi creates OpenCL from the bytecode. Generally, OpenCL constrains us to using parallel primitive arrays (OpenCL does indeed allow structs, but Java and OpenCL do not have comparable memory layouts for these structures). Therefore, you will probably need to refactor your code to use primitive arrays. In this initial contribution, we have included some limited support for Arrays of simple Objects and hope contributors extend them. Check the NewFeatures page which shows how you can use this feature. \ No newline at end of file diff --git a/doc/HSAEnablementOfLambdaBranch.md b/doc/HSAEnablementOfLambdaBranch.md deleted file mode 100644 index 15e7fe9c1b71cee17b796a38ab8a95688cafa2c0..0000000000000000000000000000000000000000 --- a/doc/HSAEnablementOfLambdaBranch.md +++ /dev/null @@ -1,32 +0,0 @@ -#HSAEnablementOfLambdaBranch -*Adding HSA Support to Aparapi lambda branch Updated Feb 28, 2014 by frost.g...@gmail.com* - -* [How to setup a HSA enabled Linux Platform](SettingUpLinuxHSAMachineForAparapi.md) -* [How to setup a HSA simulator on a Linux Platform](UsingAparapiLambdaBranchWithHSASimulator.md) - -Recently the HSA Foundation released their ‘Programmers Reference Manual’. This manual is for developers wishing to write code for upcoming HSA compatible devices, it describes the HSA Intermediate Language (HSAIL) along with its binary form (BRIG) and describes how code is expected to execute on a HSA enabled devices. - -In many ways we can think of HSAIL as we do Java bytecode. It is a common intermediate form that can be optimized at runtime to execute across a variety of future heterogeneous platforms. HSAIL will greatly simplify the development of software taking advantage of both sequential and parallel compute solutions. - -Now that the spec is out, we have started adding HSA support to the Aparapi lambda branch. We believe that HSA combined with the upcoming Java 8 feature lambda will be a natural way to express parallel algorithms which can be executed on the GPU via HSA. - -A HSA+Lambda enabled Aparapi will remove many of Aparapi's constraints. HSA allows all of the CPU's memory to be accessed directly from code running on the GPU. This means - -* We no longer need to move data from the host CPU to the GPU. -* We are no longer limited to the memory addressable from the GPU -* We can access multi-dim arrays efficiently -* We can access Java objects directly from the GPU. -These are all substantial benefits. - -In the existing code (early prototype) we provide access to HSA as a specific device type. - -So our ubiquitous 'squares' example will initially be written as: - - int in[] = ..// - int out[] = .../ - Device.hsa().forEach(in.length, (i)->{ - out[i] = in[i]*in[i]; - }); -You will obviously need a Java 8 compatible JDK ([https://jdk8.java.net/download.html](https://jdk8.java.net/download.html)) in your path. - -We also recommend using IntelliJ which has preliminary support for Java 8 lambda features. You can download the community edition of IntelliJ from [http://www.jetbrains.com/idea/](http://www.jetbrains.com/idea/) \ No newline at end of file diff --git a/doc/HSAEnablementOfLambdaBranchSidebar.md b/doc/HSAEnablementOfLambdaBranchSidebar.md deleted file mode 100644 index 3275452280bd0f065af3f2f1e9e0291927ba490f..0000000000000000000000000000000000000000 --- a/doc/HSAEnablementOfLambdaBranchSidebar.md +++ /dev/null @@ -1,6 +0,0 @@ -#HSAEnablementOfLambdaBranchSidebar -*Sidebar for HSAEnablementOfLambdaBranchAparapi* - -[How to setup a HSA enabled Linux Platform](SettingUpLinuxHSAMachineForAparapi.md) - -[How to setup a HSA simulator on a Linux Platform](UsingAparapiLambdaBranchWithHSASimulator.md) diff --git a/doc/HowToAddUML.md b/doc/HowToAddUML.md deleted file mode 100644 index 8c1c7f4997689f6f40a664e7bfd67b22e2726c8b..0000000000000000000000000000000000000000 --- a/doc/HowToAddUML.md +++ /dev/null @@ -1,39 +0,0 @@ -#HowToAddUML -*How to add plantuml docs to wiki pages Updated Apr 20, 2013 by frost.g...@gmail.com* - -Go to http://www.plantuml.com/plantuml and type in the text for you diagram. - -Hit submit and check out the diagram. - -Once you are happy, so with something like - - start - :kernel.execute(range); - if (?) then (first call for this instance) - : Convert Kernel.run() to OpenCL; - note - We also convert all - methods reachable from - kernel.run() - end note - if (?) then (Conversion was successful) - : Compile OpenCL; - : Map compiled OpenCL to this Kernel; - else (Conversion unsuccessful) - endif - else (not first call) - endif - if (?) then (OpenCL mapped for this instance) - : Bind args (send to GPU); - : Execute kernel; - else (false) - : Execute using a Java Thread Pool; - endif - stop -Paste the resulting URL into the wiki page but append %20as.png at the end of the URL - -http://www.plantuml.com:80/plantuml/img/BLAHBLAH%20as.png - -To get this! - - \ No newline at end of file diff --git a/doc/JavaKernelGuidelines.md b/doc/JavaKernelGuidelines.md deleted file mode 100644 index 89ab38dc789f31b1acf1f474c87b152a4ffbe4a6..0000000000000000000000000000000000000000 --- a/doc/JavaKernelGuidelines.md +++ /dev/null @@ -1,72 +0,0 @@ -#JavaKernelGuidelines -*What code can and can't be converted to OpenCL by Aparapi. Updated Sep 13, 2011 by frost.g...@gmail.com* -##Aparapi Java Kernel Guidelines -Certain practices can improve the chances of your Java kernel being converted to OpenCL and executing on a GPU. - -The following guidelines/restrictions only apply to the Kernel.run() method and any method reachable from run() (called†run-reachable methods†in this documentation), clearly any methods executed via a normal Java execution path will not be subject to these restrictions. - -Some restrictions/guidelines may be removed or augmented in a future Aparapi releases. - -##Data Types -* Only the Java primitive data types boolean, byte, short, int, long, and float and one-dimensional arrays of these primitive data types are supported by Aparapi. -* Aparapi support for the primitive data type double will depend on your graphics card, driver, and OpenCL version. Aparapi will query the device/platform to determine if double is supported (at runtime). If your platform does not support double, Aparapi will drop back to (Java Thread Pool) (JTP) mode. -* The primitive data type char is not supported. - -##Fields -* Elements of primitive array fields can be read from kernel code. -* Elements of primitive array fields can be written to by kernel code. -* Note that Java creates 'hidden' fields for captured final primitive arrays (from anonymous inner classes) and they can be accessed as if they were fields of the kernel. -* Primitive scalar fields can only be read by the kernel code. Because kernel run-reachable methods execute in parallel in an indeterminate order, any reliance on the result of modifications to primitive scalar fields is discouraged even when executing in Java Thread Pool mode. -* Static final fields can be read from kernel code. -* Static non-final fields are not supported for either read or write. Try to make them final. - -##Arrays -* Only one-dimensional arrays are supported. -* Arrays cannot be aliased either by direct local assignment or by passed arguments to other methods. -* Java 5’s extended 'for' syntax for (int i: arrayOfInt){} is not supported, because it causes a shallow copy of the original array under the covers. - -##Methods -* References to or through a Java Object other than your kernel instance will cause Aparapi to abandon attempting to create OpenCL (note the following exceptions). -* There are a few very specific exceptions to the above rule to allow accesses through getters/setters of objects held in arrays of objects referenced from the kernel code. -* Static methods are not supported by Aparapi. -* Recursion is not supported, whether direct or indirect. Aparapi tries to detect this recursion statically, but the developer should not rely on Aparapi to do so. -* Methods with varargs argument lists are not supported by Aparapi. -* Overloaded methods (i.e. methods with the same name but different signatures) are not supported by Aparapi. OpenCL is C99 based so we are constrained by OpenCL's lack of support for overloading. -* The kernel base class contains wrappers around most of the functions offered by java.lang.Math. When run in a thread pool these wrappers delegate back to java.lang.Math when executing in OpenCL they translate to OpenCL equivalents. - -##Other Restrictions - -* Exceptions are not supported (no throw, catch. or finally). -* New is not supported either for arrays or objects -* Synchronized blocks and synchronized methods are not supported. -* Only simple loops and conditionals are supported; switch, break, and continue are not supported. -* A variable cannot have its first assignment be the side effect of an expression evaluation or a method call. For example, the following will not be translated to run on the GPU. - - - int foo(int a) { - // . . . - } - public void run() { - int z; - foo(z = 3); - } - - -* This should be regarded as an error which needs to be addressed, as a workaround, explicitly initialize variables (even to 0) when declared. - -## Beware Of Side Effects -OpenCL is C99-based and as such the result of expressions depending on side effects of other expressions can differ from what one might expect from Java, please avoid using code that assumes Java's tighter rules. Generally code should be as simple as possible. -For example, although Java explicitly defines - - arra[i++] = arrb[i++]; - to be equivalent to - - arra[i] = arrb[i+1]; - i += 2; - -The C99/OpenCL standard does not define this and so the result would be undefined. - -##Runtime Exceptions -* When run on the GPU, array accesses will not generate an ArrayIndexOutOfBoundsException. Instead the behavior will be unspecified. -* When run on the GPU, ArithmeticExceptions will not be generated, for example with integer division by zero. Instead the behavior will be unspecified. -Attribution diff --git a/doc/LIbraryAgentDuality.md b/doc/LIbraryAgentDuality.md deleted file mode 100644 index 88e164e679d635bdd00aebc83d57ff88cb82637c..0000000000000000000000000000000000000000 --- a/doc/LIbraryAgentDuality.md +++ /dev/null @@ -1,28 +0,0 @@ -#LIbraryAgentDuality -*Aparapi libraries can now be loaded as JVMTI agents. Updated Jan 15, 2013 by frost.g...@gmail.com* - -##What are all these check-ins referring to JVMTI agents? - -If you have been tracking Aparapi SVN checkins you will have noticed a bunch of changes to JNI code. I just finished arranging for aparapi libraries (.dll or .so) to be able to be loaded as JVMTI agent. Now (assuming library is in ${APARAPI_DIR}) we can either launch using the traditional... - - java –Djava.library.path=${APARAPI_DIR} –classpath ${APARAPI_DIR}/aparapi.jar;my.jar mypackage.MyClass - -or ... - - java –agentpath=${APARAPI_DIR}/aparapi_x86_64.dll –classpath ${APARAPI_DIR}/aparapi.jar;my.jar mypackage.MyClass - -So the dll/so is now both ‘just a library’ and a JVMTI agent. - -##When would I need an agent? - -Prevously Aparapi loaded classes that it needed to convert to OpenCL using java.lang.Class.getResourceAsStream(). This only works if we have a jar, or if the classes are on the filesystem somewhere. This approach will not work for 'synthetically generated classes'. - -There are applications/frameworks which create synthetic classes (at runtime) which would not normally be useable by Aparapi. - -Specifically (and significantly) Java 8 uses synthetic classes to capture args (closure captures) so they can be passed to the final lambda implementation. We needed a way to allow Aparapi to access bytecode of any class, not just those in jars or on the disk. - -A JVMTI agent can register an interest in loaded classes (loaded by the classloader)do this. So when we use the aparapi library in 'agent mode' it caches all bytes for all loaded classes (yes we could filter by name) and puts this information in a common data structure (should be a map but is a linked list at present). - -By adding a new OpenCLJNI.getBytes(String) JNI method, Aparapi can now retrieve the bytes for any loaded classes, out of this cache. - -So this combined with our ability to parse classes which don’t have line number information should really enable Aparapi to be used with Scala/JRuby/Groovy or other dynamic scripting languages which create classes on the fly. diff --git a/doc/MultipleEntryPointSupportProposal.md b/doc/MultipleEntryPointSupportProposal.md deleted file mode 100644 index bf2d70563fcc52aea2db5e6d8008db376168e22e..0000000000000000000000000000000000000000 --- a/doc/MultipleEntryPointSupportProposal.md +++ /dev/null @@ -1,377 +0,0 @@ -#MultipleEntryPointSupportProposal -*How to extend Aparapi to allow multiple entrypoints for kernels Updated Jul 30, 2012 by frost.g...@gmail.com* - -##The Current Single Entrypoint World - -At present Aparapi allows us to dispatch execution to a single 'single entry point' in a Kernel. Essentially for each Kernel only the overridden Kernel.run() method can be used to initiate execution on the GPU. - -Our canonical example is the 'Squarer' Kernel which allows us to create squares for each element in an input array in an output array. - - Kernel squarer = new Kernel(){ - @Overide public void run(){ - int id = getGlobalId(0); - out[id] = in[id] * in[id]; - } - }; - -If we wanted a vector addition Kernel we would have to create a whole new Kernel. - - Kernel adder = new Kernel(){ - @Overide public void run(){ - int id = getGlobalId(0); - out[id] = in[id] * in[id]; - } - }; - -For us to square and then add a constant we would have to invoke two kernels. Or of course create single SquarerAdder kernel. - -See this page EmulatingMultipleEntrypointsUsingCurrentAPI for ideas on how to emulate having multiple methods, by passing data to a single run() method. - -##Why can't Aparapi just allow 'arbitary' methods - -Ideally we would just expose a more natural API, one which allows us to provide specific methods for each arithmetic operation. - -Essentially - - class VectorKernel extends Kernel{ - public void add(); - public void sub(); - public void sqr(); - public void sqrt(); - } - -Unfortunately this is hard to implement using Aparapi. There are two distinct problems, both at runtime. - - How will Aparapi know which of the available methods we want to execute when we call Kernel.execute(range)? - On first execution how does Aparapi determine which methods might be entrypoints and are therefore need to be converted to OpenCL? - -The first problem can be solved by extending Kernel.execute() to accept a method name - - kernel.execute(SIZE, "add"); - -This is the obvious solution, but really causes maintenence issues int that it trades compile time reporting for a runtime errors. If a developer mistypes the name of the method, :- - - kernel.execute(SIZE, "sadd"); // there is no such method - -The code will compile perfectly, only at runtime will we detect that there is no such method. -##An aside - -Maybe the new Java 8 method reference feature method might help here. In the paper below Brian Goetz talks about a double-colon syntax (Class::Method) for directly referencing a method which is presumably checked at compile time. - -So presumably - - kernel.execute(SIZE, VectorKernel::add); - -Would compile just fine, whereby - - kernel.execute(SIZE, VectorKernel::sadd); - -Would yield a compile time error. - -See Brian Goetz's excellent Lambda documentation -##back from Aside - -The second problem (knowing which methods need to be converted to OpenCL) can probably be solved using an Annotation. - - class VectorKernel extends Kernel{ - @EntryPoint public void add(); - @EntryPoint public void sub(); - @EntryPoint public void sqr(); - @EntryPoint public void sqrt(); - public void nonOpenCLMethod(); - } - -Here the @EntryPoint annotation allows the Aparapi runtime to determine which methods need to be exposed. -#My Extension Proposal - -Here is my proposal. Not only does it allow us to reference multiple entryoints, but I think it actually improves the single entrypoint API, albeit at the cost of being more verbose. -##The developer must provide an API interface - -First I propose that we should ask the developer to provide an interface for all methods that we wish to execute on the GPU (or convert to OpenCL). - - interface VectorAPI extends AparapiAPI { - public void add(Range range); - public void sub(Range range); - public void sqrt(Range range); - public void sqr(Range range); - } - -Note that each API takes a Range, this will make more sense in a moment. -##The developer provides a bound implementation - -Aparapi should provide a mechanism for mapping the proposed implementation of the API to it's implementation. - -Note the weasel words here, this is not a conventional implementation of an interface. We will use an annotation (@Implements(Class class)) to provide the binding. - - @Implements(VectorAPI.class) class Vector extends Kernel { - public void add(RangeId rangeId){/*implementation here */} - public void sub(RangeId rangeId){/*implementation here */} - public void sqrt(RangeId rangeId){/*implementation here */} - public void sqr(RangeId rangeId){/*implementation here */} - public void public void nonOpenCLMethod(); - } - -##Why we can't the implementation just implement the interface? - -This would be ideal. Sadly we need to intercept a call to say VectorAPI.add(Range) and dispatch to the resulting Vector.add(RangeId) instances. If you look at the signatures, the interface accepts a Range as it's arg (the range over which we intend to execute) whereas the implementation (either called by JTP threads or GPU OpenCL dispatch) receives a RangeId (containing the unique globalId, localId, etc fields). At the very end of this page I show a strawman implementation of a sequential loop implementation. -##So how do we get an implementation of VectorAPI - -We instantiate our Kernel by creating an instance using new. We then ask this instance to create an API instance. Some presumably java.util.Proxy trickery will create an implementation of the actual instance, backed by the Java implementation. - -So execution would look something like. - - Vector kernel = new Vector(); - VectorAPI kernelApi = kernel.api(); - Range range = Range.create(SIZE); - kernalApi.add(range); - -So the Vector instance is a pure Java implementation. The extracted API is the bridge to the GPU. - -Of course then we can also execute using an inline call through api() - - Vector kernel = new Vector(); - Range range = Range.create(SIZE); - kernel.api().add(range); - kernel.api().sqrt(range); - -or even expose api as public final fields - - Vector kernel = new Vector(); - Range range = Range.create(SIZE); - kernel.api.add(range); - kernel.api.sqrt(range); - -##How would our canonical Squarer example look - - interface SquarerAPI extends AparapiAPI{ - square(Range range); - } - - @Implement(SquarerAPI) class Squarer extends Kernel{ - int in[]; - int square[]; - public void square(RangeId rangeId){ - square[rangeId.gid] = in[rangeId.gid]*in[rangeId.gid]; - } - } - -Then we execute using - - Squarer squarer = new Squarer(); - // fill squarer.in[SIZE] - // create squarer.values[SIZE]; - -squarer.api().square(Range.create(SIZE)); - -#Extending this proposal to allow argument passing - -Note that we have effectively replaced the use of the 'abstract' squarer.execute(range) with the more concrete squarer.api().add(range). - -Now I would like to propose that we take one more step by allowing us to pass arguments to our methods. - -Normally Aparapi captures buffer and field accesses to create the args that it passes to the generated OpenCL code. In our cannonical squarer example the in[] and square[] buffers are captured from the bytecode and passed (behind the scenes) to the OpenCL. - -* **TODO: Add generated OpenCl code to show what this looks like.** * - -However, by exposing the actual method we want to execute, we could also allow the API to accept parameters. - -So our squarer example would go from - - interface SquarerAPI extends AparapiAPI{ - square(Range range); - } - - @Implement(SquarerAPI) class Squarer extends Kernel{ - int in[]; - int square[]; - public void square(RangeId rangeId){ - square[rangeId.gid] = in[rangeId.gid]*in[rangeId.gid]; - } - } - - - Squarer squarer = new Squarer(); - // fill squarer.in[SIZE] - // create squarer.values[SIZE]; - - squarer.api().square(Range.create(SIZE)); - -to - - interface SquarerAPI extends AparapiAPI{ - square(Range range, int[] in, int[] square); - } - - @Implement(SquarerAPI) class Squarer extends Kernel{ - public void square(RangeId rangeId, int[] in, int[] square){ - square[rangeId.gid] = in[rangeId.gid]*in[rangeId.gid]; - } - } - - - Squarer squarer = new Squarer(); - int[] in = // create and fill squarer.in[SIZE] - int[] square = // create squarer.values[SIZE]; - - squarer.api().square(Range.create(SIZE), in, result); - -I think that this makes Aparapi look more conventional. It also allows us to allow overloading for the first time. - - interface SquarerAPI extends AparapiAPI{ - square(Range range, int[] in, int[] square); - square(Range range, float[] in, float[] square); - } - - @Implement(SquarerAPI) class Squarer extends Kernel{ - public void square(RangeId rangeId, int[] in, int[] square){ - square[rangeId.gid] = in[rangeId.gid]*in[rangeId.gid]; - } - public void square(RangeId rangeId, float[] in, float[] square){ - square[rangeId.gid] = in[rangeId.gid]*in[rangeId.gid]; - } - } - - - Squarer squarer = new Squarer(); - int[] in = // create and fill squarer.in[SIZE] - int[] square = // create squarer.values[SIZE]; - - squarer.api().square(Range.create(SIZE), in, result); - float[] inf = // create and fill squarer.in[SIZE] - float[] squaref = // create squarer.values[SIZE]; - - squarer.api().square(Range.create(SIZE), inf, resultf); - ---- - -test harness - - import java.lang.reflect.InvocationHandler; - import java.lang.reflect.Method; - import java.lang.reflect.Proxy; - - - public class Ideal{ - - public static class OpenCLInvocationHandler<T> implements InvocationHandler { - Object instance; - OpenCLInvocationHandler(Object _instance){ - instance = _instance; - } - @Override public Object invoke(Object interfaceThis, Method interfaceMethod, Object[] interfaceArgs) throws Throwable { - Class clazz = instance.getClass(); - - Class[] argTypes = interfaceMethod.getParameterTypes(); - argTypes[0]=RangeId.class; - Method method = clazz.getDeclaredMethod(interfaceMethod.getName(), argTypes); - - - if (method == null){ - System.out.println("can't find method"); - }else{ - RangeId rangeId = new RangeId((Range)interfaceArgs[0]); - interfaceArgs[0]=rangeId; - for (rangeId.wgid = 0; rangeId.wgid <rangeId.r.width; rangeId.wgid++){ - method.invoke(instance, interfaceArgs); - } - } - - return null; - } - } - - static class Range{ - int width; - Range(int _width) { - width = _width; - } - } - - static class Range2D extends Range{ - int height; - - Range2D(int _width, int _height) { - super(_width); - height = _height; - } - } - - static class Range1DId<T extends Range>{ - Range1DId(T _r){ - r = _r; - } - T r; - - int wgid, wlid, wgsize, wlsize, wgroup; - } - - static class RangeId extends Range1DId<Range>{ - RangeId(Range r){ - super(r); - } - } - - static class Range2DId extends Range1DId<Range2D>{ - Range2DId(Range2D r){ - super(r); - } - - int hgid, hlid, hgsize, hlsize, hgroup; - } - - - - - - static <T> T create(Object _instance, Class<T> _interface) { - OpenCLInvocationHandler<T> invocationHandler = new OpenCLInvocationHandler<T>(_instance); - T instance = (T) Proxy.newProxyInstance(Ideal.class.getClassLoader(), new Class[] { - _interface, - - }, invocationHandler); - return (instance); - - } - - - - public static class Squarer{ - interface API { - public API foo(Range range, int[] in, int[] out); - public Squarer dispatch(); - - } - - public API foo(RangeId rangeId, int[] in, int[] out) { - out[rangeId.wgid] = in[rangeId.wgid]*in[rangeId.wgid]; - return(null); - } - } - - /** - * @param args - */ - public static void main(String[] args) { - - Squarer.API squarer = create(new Squarer(), Squarer.API.class); - int[] in = new int[] { - 1, - 2, - 3, - 4, - 5, - 6 - }; - int[] out = new int[in.length]; - Range range = new Range(in.length); - - squarer.foo(range, in, out); - - for (int s:out){ - System.out.println(s); - } - - } - - } - diff --git a/doc/NewFeatures.md b/doc/NewFeatures.md deleted file mode 100644 index 4bcb8f5983bc4063edee4e84160f39c9f8b6be75..0000000000000000000000000000000000000000 --- a/doc/NewFeatures.md +++ /dev/null @@ -1,227 +0,0 @@ -#NewFeatures -*New Features added to this open source release of Aparapi. Updated Sep 14, 2011 by frost.g...@gmail.com* -##New Features -Aparapi has two new, especially useful features: - -Explicit Buffer Management for minimizing buffer transfers -Kernel access to objects held in arrays -###Minimizing Buffer Transfers -####Explicit Buffer Management -Aparapi is designed to shield the Java developer from dealing with the underlying movement of data between the OpenCL host and device. Aparapi can analyze a kernel's run() method and run-reachable methods to determine which primitive arrays to transfer to the GPU prior to execution, and which arrays to transfer back when the GPU execution is complete. - -Generally this strategy is both clean and performant. Aparapi will attempt to just do the right thing. - -However, occasionally the following code pattern is seen. - - final int[] hugeArray = new int[HUGE]; - final int[] done = new int[]{0}; - Kernel kernel= new Kernel(){ - ... // reads/writes hugeArray and writes to done[0] when complete - }; - done[0]=0; - while (done[0] ==0)){ - kernel.execute(HUGE); - } -This is a common pattern in reduce stages of map-reduce type problems. Essentially the developer wants to keep executing a kernel until some condition is met. For example, this may be seen in bitonic sort implementations and various financial applications. - -From the code it can be seen that the kernel reads and writes hugeArray[] array and uses the single item done[] array to indicate some form of convergence or completion. - -Unfortunately, by default Aparapi will transfer done[] and hugeArray[] to and from the GPU device each time Kernel.execute(HUGE) is executed. - -To demonstrate which buffers are being transfered, these copies are shown as comments in the following version of the code. - - final int[] hugeArray = new int[HUGE]; - final int[] done = new int[]{0}; - Kernel kernel= new Kernel(){ - ... // reads/writes hugeArray and writes to done[0] when complete - }; - done[0]=0; - while (done[0] ==0)){ - // Send done[] to GPU - // Send hugeArray[] to GPU - kernel.execute(HUGE); - // Fetch done[] from GPU - // Fetch hugeArray[] from GPU - } -Further analysis of the code reveals that hugeArray[] is not accessed by the loop containing the kernel execution, so Aparapi is performing 999 unnecessary transfers to the device and 999 unnecessary transfers back. Only two transfers of hugeArray[] are needed; one to move the initial data to the GPU and one to move it back after the loop terminates. - -The done[] array is accessed during each iteration (although never written to within the loop), so it does needs to be transferred back for each return from Kernel.execute(), however, it only needs to be sent once. - -Clearly it is better to avoid unnecessary transfers, especially of large buffers like hugeArray[]. - -A new Aparapi feature allows the developer to control these situations and explicitly manage transfers. - -To use this feature first set the mode to explicit, using the kernel.setExplicit(true) method, and then requests transfers using either kernel.put() or kernel.get(). Kernel.put() forces a transfer to the GPU device and Kernel.get() transfers data back. - -The following code illustrates the use of these new explicit buffer management APIs. - - final int[] hugeArray = new int[HUGE]; - final int[] done = new int[]{0}; - Kernel kernel= new Kernel(){ - ... // reads/writes hugeArray and writes to done[0] when complete - }; - kernel.setExplicit(true); - done[0]=0; - kernel.put(done); - kernel.put(hugeArray); - while (done[0] ==0)){ - kernel.execute(HUGE); - kernel.get(done); - } - kernel.get(hugeArray); -Note that marking a kernel as explicit and failing to request the appropriate transfer is a programmer error. - -We deliberately made Kernel.put(…), Kernel.get(…) and Kernel.execute(range) return an instance of the executing kernel to allow these calls be chained. Some may find this fluent style API more expressive. - - final int[] hugeArray = new int[HUGE]; - final int[] done = new int[]{0}; - Kernel kernel= new Kernel(){ - ... // reads/writes hugeArray and writes to done[0] when complete - }; - kernel.setExplicit(true); - done[0]=0; - kernel.put(done).put(hugeArray); // chained puts - while (done[0] ==0)){ - kernel.execute(HUGE).get(done); // chained execute and put - } - kernel.get(hugeArray); -####An alternate approach for loops containing a single kernel.execute(range) call. -One variant of code which would normally suggest the use of Explicit Buffer Management can be handled differently. For cases where Kernel.execute(range) is the sole statement inside a loop and where the iteration count is known prior to the first iteration we offer an alternate (hopefully more elegant) way of minimizing buffer transfers. - -So for cases like:- - - final int[] hugeArray = new int[HUGE]; - Kernel kernel= new Kernel(){ - ... // reads/writes hugeArray - }; - - for (int pass=0; pass<1000; pass++){ - kernel.execute(HUGE); - } -The developer can request that Aparapi perform the outer loop rather than coding the loop. This is achieved explicitly by passing the iteration count as the second argument to Kernel.execute(range, iterations). - -Now any form of code that looks like :- - - int range=1024; - int loopCount=64; - for (int passId=0; passId<loopCount; passId++){ - kernel.execute(range); - } -Can be replaced with - - int range=1024; - int loopCount=64; - - kernel.execute(range, loopCount); -Not only does this make the code more compact and avoids the use of explicit buffer management APIs, it allows Aparapi visibility to the complete loop so that Aparapi can minimize the number of transfers. Aparapi will only transfer buffers to the GPU once and transfer them back once, resulting in improved performance. - -Sometimes kernel code using this loop-pattern needs to track the current iteration number as the code passed through the outer loop. Previously we would be forced to use explicit buffer management to allow the kernel to do this. - -The code for this would have looked something like - - int range=1024; - int loopCount=64; - final int[] hugeArray = new int[HUGE]; - final int[] passId = new int[0]; - Kernel kernel= new Kernel(){ - @Override public void run(){ - int id=getGlobalId(); - if (passId[0] == 0){ - // perform some initialization! - } - ... // reads/writes hugeArray - } - }; - Kernel.setExplicit(true); - kernel.put(hugeArray); - for (passId[0]=0; passId[0]<loopCount; passId[0]++){ - - kernel.put(passId).execute(range); - } -In the current version of Aparapi we added Kernel.getPassId() to allow a Kernel to determine the current ‘pass’ through the outer loop without having to use explicit buffer management. - -So the previous code can now be written without any explicit buffer management APIs:- - - final int[] hugeArray = new int[HUGE]; - final int[] pass[] = new int[]{0}; - Kernel kernel= new Kernel(){ - @Override public void run(){ - int id=getGlobalId(); - int pass = getPassId(); - if (pass == 0){ - // perform some initialization! - } - ... // reads/writes both hugeArray - } - }; - - kernel.execute(HUGE, 1000); -One common use for Kernel.getPassId() is to avoid flipping buffers in the outer loop. - -It is common for kernels to process data from one buffer to another, and in the next invocation process the data back the other way. Now these kernels can use the passId (odd or even) to determine the direction of data transfer. - - final int[] arr1 = new int[HUGE]; - final int[] arr2 = new int[HUGE]; - Kernel kernel= new Kernel(){ - int f(int v){ … } - - @Override public void run(){ - int id=getGlobalId(); - int pass = getPassId(); - if (pass%2==0){ - arr1[id] = f(arr2[id]); - }else{ - arr2[id] = f(arr1[id]); - - } - } - }; - - kernel.execute(HUGE, 1000); - -####Allow kernels to access simple arrays of objects -Aparapi needs to create OpenCL from the bytecode that it sees. Generally OpenCL constrains us to using parallel primitive arrays (OpenCL allows structs, but Java and OpenCL do not have comparable memory layouts for these structures). Therefore, you will generally need to refactor your code from a classic object-oriented form to use primitive arrays. - -This incompatibility between data-parallel and object-oriented code patterns might discourage use of Aparapi, so Aparapi includes limited support for arrays of simple Objects. Future versions may well extend this functionality and address performance loss. - -Consider the NBody example. - -Typically, a Java developer writing NBody would probably not separate the x,y and z ordinates into parallel arrays of floats as was required in the previous (alpha) version of Aparapi. Instead, a Java developer would probably create a Body class to hold the state of each body and possibly a Universe class (container of Body instances) with the responsible for positioning and possibly displaying the bodies. - - class Body{ - float x,y,z; - float getX(){return x;} - void setX(float _x){ x = _x;} - float getY(){return y;} - void setY(float _y){ y = _y;} - float getZ(){return z;} - void setZ(float _z){ z = _z;} - - - // other data related to Body unused by positioning calculations - } - - class Universe{ - final Body[] bodies; - public Universe(final Body[] _bodies){ - bodies = _bodies; - } - void adjustPositions(){ - for (Body outer:bodies){ - for (Body inner:bodies}{ - // adjust outer position to reflect the effect of inner - // using inner and outer getters and setters for x, y and z - } - } - } - void display(){ - for (Body body:bodies){ - // draw body based on x, y and z using Body getters - } - } - } -From the above code we see that the Universe.adjustPositions() method is compute intensive and an ideal candidate for refactoring to use Aparapi. The current version of Aparapi is able to deal with simple arrays of objects like this. - -Now when Aparapi encounters an array of objects and the accesses to these objects are constrained to simple getters and setters, Aparapi will automatically extract the values of the accessed fields into a data parallel form, execute the kernel and then replace the results back in the original objects in the array. This happens on each call to Kernel.execute() and is fairly costly (from a performance point of view), however, for embarrassingly parallel code (such as NBody), we can still show considerable performance gains over standard Java Thread Pool - -Attribution \ No newline at end of file diff --git a/doc/NewOpenCLBinding.md b/doc/NewOpenCLBinding.md deleted file mode 100644 index 32e5f4347b94d3e6b300543873850158350bdfde..0000000000000000000000000000000000000000 --- a/doc/NewOpenCLBinding.md +++ /dev/null @@ -1,51 +0,0 @@ -#NewOpenCLBinding -*How to use new OpenCL binding mechanism. Updated Mar 6, 2012 by frost.g...@gmail.com* -As a step towards the extension mechanism I needed a way to easily bind OpenCL to an interface. - -Here is what I have come up with. We will use the 'Square' example. - -You first define an interface with OpenCL annotations.. - - interface Squarer extends OpenCL<Squarer>{ - @Kernel("{\n"// - + " const size_t id = get_global_id(0);\n"// - + " out[id] = in[id]*in[id];\n"// - + "}\n")// - public Squarer square(// - Range _range,// - @GlobalReadOnly("in") float[] in,// - @GlobalWriteOnly("out") float[] out); - } - -This describes the API we wish to bind to a set of kernel entrypoints (here we only have one, but we could have many). Then you 'realize' the interface by asking a device to create an implementation of the interface. Device is a new Aparapi class which represents a GPU or CPU OpenCL device. So here we are asking for the first (default) GPU device to realize the interface. - - Squarer squarer = Device.firstGPU(Squarer.class); -Now you can call the implementation directly with a Range. - - squarer.square(Range.create(in.length), in, out); -I think that we will have the easiest OpenCL binding out there... - -Following some conversations/suggestions online http://a-hackers-craic.blogspot.com/2012/03/aparapi.html we could also offer the ability to provide the OpenCL source from a file/url course using interface level Annotations. - -So we could allow. - - @OpenCL.Resource("squarer.cl"); - interface Squarer extends OpenCL<Squarer>{ - public Squarer square(// - Range _range,// - @GlobalReadOnly("in") float[] in,// - @GlobalWriteOnly("out") float[] out); - } -Or if the text is on-hand at compile time in a single constant string - - @OpenCL.Source("... opencl text here"); - interface Squarer extends OpenCL<Squarer>{ - public Squarer square(// - Range _range,// - @GlobalReadOnly("in") float[] in,// - @GlobalWriteOnly("out") float[] out); - } -Finally to allow for creation of dynamicl OpenCL (good for FFT's of various Radii). - - String openclSource = ...; - Squarer squarer = Device.firstGPU(Squarer.class, openclSource); diff --git a/doc/PossibleAparapiLambdaSyntaxOptions.md b/doc/PossibleAparapiLambdaSyntaxOptions.md deleted file mode 100644 index 8bfcf5f9cba7849ec5f4946bfc2a634c6e5089b5..0000000000000000000000000000000000000000 --- a/doc/PossibleAparapiLambdaSyntaxOptions.md +++ /dev/null @@ -1,96 +0,0 @@ -#PossibleAparapiLambdaSyntaxOptions -*syntax suggestions for HSA enabled Aparapi* - -#Introduction -Now that Java 8 is nearly upon us and HSA enabled Aparapi 'lambda' branch is usable (though in no way complete) I figured we could use this page to discuss the 'programming model' we might prefer for Aparapi, and contrast with the API's for the new Java 8 lambda based stream APIs. - -##Converting between Aparapi HSA + Java 8 enabled Aparapi -Our **hello world** app has always been the ''vector add''. In classic Aparapi we could transform - - final float inA[] = .... // get a float array from somewhere - final float inB[] = .... // get a float from somewhere - // assume (inA.length==inB.length) - final float result = new float[inA.length]; - - for (int i=0; i<array.length; i++){ - result[i]=intA[i]+inB[i]; - } -to - - Kernel kernel = new Kernel(){ - @Override public void run(){ - int i= getGlobalId(); - result[i]=intA[i]+inB[i]; - } - }; - Range range = Range.create(result.length); - kernel.execute(range); -For the lambda aparapi branch we can currently use - - Device.hsa().forEach(result.length, i-> result[i]=intA[i]+inB[i]); -Note that the closest Java 8 construct is - - IntStream.range(0, result.length).parallel().forEach(i-> result[i]=intA[i]+inB[i]); -Aparapi and Java 8 stream API's both use IntConsumer as the lambda type. So you can reuse the lambda. - - IntConsumer lambda = i-> result[i]=intA[i]+inB[i]; - - IntStream.range(0, result.length).parallel().forEach(lambda); - Device.hsa().forEach(result.length, lambda); -Exposing the Deviceness of this was a conscious effort. We may also hide it completely. - - IntConsumer lambda = i-> result[i]=intA[i]+inB[i]; - - IntStream.range(0, result.length).parallel().forEach(lambda); - Aparapi.forEach(result.length, lambda); -I am toying with providing an API which maps more closely to the Stream API from Java 8. - -Maybe - - IntStream.range(0, result.length).parallel().forEach(lambda); - Aparapi.range(0, result.length).parallel().forEach(lambda); -This way users can more readily swap between the two. - -For collections/arrays in Aparapi we can also offer - - T[] arr = // get an array of T from somewhere - ArrayList<T> list = // get an array backed list of T from somewhere - - Aparapi.range(arr).forEach(t -> /* do something with each T */); -We can create special cases. Say for mutating images - - BufferedImage in, out; - Aparapi.forEachPixel(in, out, rgb[] -> rgb[0] = 0 ); -We may also need select operations for associative operations - - class Person{ - int age; - String first; - String last; - }; - - Aparapi.selectOne(Person[] people, (p1,p2)-> p1.age>p2.age?p1:p2 ); -##A case for map reduce -A mapper maps from one type to another. Possibly by extracting state. Here is a mapper which maps each String in an array of Strings to its length. - -As if the mapper was - - interface mapToInt<T>{ int map(T v); } -Here it is in action. - - Aparapi.range(strings).map(s->string.length())... -Now the result is a stream of int's which can be 'reduced' by a reduction lambda. - -In this case the reduction reduces two int's to one, by choosing the max of k and v. All reductions must be commutative style operations (max, min, add) where the order of execution is not important. - - int lengthOfLongestString = Aparapi.range(strings).map(s->string.length()).reduce((k,v)-> k>v?k:v); -Here we had a sum reduction. - - int sumOfLengths = Aparapi.range(strings).map(s ->string.length()).reduce((k,v)-> k+v); -Some of these may be common enough that we offer direct functionality. - - int sumOfLengths = Aparapi.range(strings).map(s ->string.length()).sum(); - int maxOfLengths = Aparapi.range(strings).map(s ->string.length()).max(); - int minOfLengths = Aparapi.range(strings).map(s ->string.length()).min(); - String string = Aparapi.range(strings).map(s->string.length()).select((k,v)-> k>v); -This last one needs some explaining. We map String to int then select the String whose length is the greatest. \ No newline at end of file diff --git a/doc/PrivateMemorySpace.md b/doc/PrivateMemorySpace.md deleted file mode 100644 index 4b51d2f8aded645703376d97724d192cf0d65ddd..0000000000000000000000000000000000000000 --- a/doc/PrivateMemorySpace.md +++ /dev/null @@ -1,34 +0,0 @@ -PrivateMemorySpace -================== - -*Using `__private` memory space in Aparapi kernels. Phase-Implementation Updated Sep 14, 2014 by barneydp...@gmail.com* - -## Introduction -The private memory space identifier (just "private" is also recognised) can be applied to struct fields in order to indicate that the data is not shared with/accessible to other kernel instances. Whilst this is the default for non-array data, it must be explicitly applied to array fields in order to make them private. Aparapi now supports arrays in the private memory space. - -The private memory space is generally only suitable for smallish arrays, but is required for certain algorithms, e.g. for those which must mutate (for example, sort or partially sort) an exclusive copy of an array/subarray. - -##Details -In Aparapi there are two mechanisms available to mark a Kernel class member as belonging to the private memory space when mapped to OpenCL code (matching the equivalent functionality for marking items as belonging to the local memory space). Either the field can be named with a suffix plus buffer size, for example - - protected short[] myBuffer_$private$32 = new short[32]; -or using the Annotation Kernel.PrivateMemorySpace, for example - - protected @PrivateMemorySpace(32) short[] myBuffer = new short[32]; -The latter should be used in preference to the former. - -Note that OpenCL requires that the size of a private array be fixed at compile time for any kernel. Thus it is not possible for a single Kernel subclass to support private buffers of varying size. Unfortunately this may entail creating multiple subclasses with varying buffer sizes in order to most efficiently support varying private buffer sizes. - -Of course, a single Kernel class can be created which has a private buffer large enough for all use cases, though this may be suboptimal if only a small fraction of the maximum buffer size is commonly required. - -Because private buffers are unshared, they require much more of a GPU's memory than a local or global buffer of the same size, and should therefore be used sparingly and kept as small as possible, as overuse of large private arrays might cause GPU execution to fail on lower-end graphics cards. - -However, private memory space is the fastest of all OpenCls memory spaces, so may in some limited cases might be used to increase execution speed even when the kernel does not need to modify the array and a shared (local or global) array would suffice - for example to provide a smallish lookup-table to replace an expensive function call. - -Without modification, an Aparapi kernel which uses private buffers may fail to work when invoked in Java Threadpool (JTP) mode, because the buffer will be shared across multiple threads. However a simple mechanism exists which allows such buffers to be used safely in JTP execution mode. - -The Kernel.NoCL annotation exists to allow specialised code to be executed when running in Java (or JTP) which is not invoked when running on the GPU. A NoCL method can be inserted at the begining of a Kernel's run() method which sets the private array to a value obtained from a static ThreadLocal<foo[]> where foo is the primitive type of the array in question. This will have no effect upon OpenCL execution, but will allow threadsafe execution when running in java. - -In the project samples, there is a package com.syncleus.com.syncleus.aparapi.examples.median which gives an example of a median image filter which uses a private array of pixel data to apply a distructive median algorithm to a "window" of local pixels. This sample also demonstrates how to use the ThreadLocal trick to allow correct behaviour when running in JTP execution mode. - -[http://code.google.com/p/aparapi/source/browse/trunk/samples/median/src/com/amd/aparapi/sample/median/MedianDemo.java](http://code.google.com/p/aparapi/source/browse/trunk/samples/median/src/com/amd/aparapi/sample/median/MedianDemo.java) \ No newline at end of file diff --git a/doc/ProfilingKernelExecution.md b/doc/ProfilingKernelExecution.md deleted file mode 100644 index 5ee1fb95ef221e855f18d24c0a83a6caea8216ee..0000000000000000000000000000000000000000 --- a/doc/ProfilingKernelExecution.md +++ /dev/null @@ -1,53 +0,0 @@ -#ProfilingKernelExecution -*Using Aparapi's built in profiling APIs Updated May 7, 2013 by frost.g...@gmail.com* - -If you want to extract OpenCL performance info from a kernel at runtime you need to set the property :- - - -Dcom.syncleus.aparapi.enableProfiling=true - -Your application can then call kernel.getProfileInfo() after a successful call to kernel.execute(range) to extract a List List<ProfileInfo>. - -Each ProfileInfo holds timing information for buffer writes, executs and buffer reads. - -The following code will print a simple table of profile information - - List<ProfileInfo> profileInfo = k.getProfileInfo(); - for (final ProfileInfo p : profileInfo) { - System.out.print(" " + p.getType() + " " + p.getLabel() + " " + (p.getStart() / 1000) + " .. " - + (p.getEnd() / 1000) + " " + ((p.getEnd() - p.getStart()) / 1000) + "us"); - System.out.println(); - } - -Here is an example implementation - - final float result[] = new float[2048*2048]; - Kernel k = new Kernel(){ - public void run(){ - final int gid=getGlobalId(); - result[gid] =0f; - } - }; - k.execute(result.length); - List<ProfileInfo> profileInfo = k.getProfileInfo(); - - for (final ProfileInfo p : profileInfo) { - System.out.print(" " + p.getType() + " " + p.getLabel() + " " + (p.getStart() / 1000) + " .. " - + (p.getEnd() / 1000) + " " + ((p.getEnd() - p.getStart()) / 1000) + "us"); - System.out.println(); - } - k.dispose(); - } - } -And here is the tabular output from - - java - -Djava.library.path=${APARAPI_HOME} - -Dcom.syncleus.aparapi.enableProfiling=true - -cp ${APARAPI_HOME}:. - MyClass - - W val$result 69500 .. 72694 3194us - X exec() 72694 .. 72835 141us - R val$result 75327 .. 78225 2898us - -The table shows that the transfer of the 'result' buffer to the device ('W') took 3194 us (micro seconds), the execute ('X') of the kernel 141 us and the read ('R') of resulting buffer 2898 us. \ No newline at end of file diff --git a/doc/ProfilingKernelsFromEclipse.md b/doc/ProfilingKernelsFromEclipse.md deleted file mode 100644 index c1edfc9ebf2cd2a85f43b088dc237bc71ce1dba7..0000000000000000000000000000000000000000 --- a/doc/ProfilingKernelsFromEclipse.md +++ /dev/null @@ -1,97 +0,0 @@ -#ProfilingKernelsFromEclipse -*Profiling Kernels with AMD profiler in Eclipse (Indigo) Updated May 14, 2012 by frost.g...@gmail.com* - -##Profiling Kernels with AMD profiler in Eclipse (Indigo) - -Wayne Johnson - -12 May 2012 -Disclaimer: This has been tested with Eclipse (Indigo SR1) only on W7SR1. - -Assume your Eclipse project follows a typical Maven layout: - - Project - src/main/java/... - AlgorithmImplementation.java - src/test/java/... - BenchmarkRunner.java - BenchmarkTest.java - lib/aparapi-2012-02-15/ - aparapi jar file - native libraries for W7, Linux, and OSX - … - profiles/ - [this is where the profiles and logs will be generated] - -1. Download and install the current AMD APP SDK -2. Download and install Aparapi (see Wiki), making sure that the native libraries are on your build path. -3. Create your algorithm implementation(s). - - example: AlgorithmImplementations.java - -4. Create your performance benchmark test as a JUnit test case to exercise your implementations. - - example: BenchmarkTest.java - -5. Test your JUnit test case inside Eclipse using BenchmarkRunner to make sure it works. The runner will be the main application for the runnable jar file you create in the next step. - - This step will also automatically create the launch configuration that the export command will ask you for. Select BenchmarkRunner.java - - Right-click > Run as > Java application - -6. Export your project as a runnable jar file. - - Right-click > Export... - [wizard] Java > Runnable Jar File. Next. - Launch configuration: BenchmarkRunner [1] - Project - Export destination: Project\runner.jar - Library handling: [use default] Finish. - Ok on “...repacks referenced libraries†- Yes on “Confirm replace†[You won’t see this dialog on the first export but will on subsequent exports] - Ok [ignore warning dialog] - - After refreshing Project, you should see a runner.jar file at the top level. - -7. Create an external tool configuration to generate the performance counter profile - - Run > External Tools > External Tool Configurations... - Name: AMD counters - Project - Location: C:\Program Files (x86)\AMD APP\tools\AMD APP Profiler 2.4\x64\sprofile.exe - Arguments: - -o "${project_loc}\profiles\counters.csv" - -w "${project_loc}" - "C:\Program Files\Java\jdk1.6.0_30\bin\java.exe" - -Djava.library.path="lib\aparapi-2012-02-15" - -jar "${project_loc}\runner.jar" - - - Note: The ''java.library.path'' indicates the relative location of the folder containing the native libraries used by Aparapi. If this is not set correctly, steps 9 and 10 below will run in JTP execution mode and the only error message you will see on the Eclipse console is that the profile was not generated. This is because nothing executed on the GPU. - -8. Create an external tool configuration to generate the cltrace and summary profiles. - - 1. Run > External Tools > External Tool Configurations... - 2. Name: AMD cltrace - Project - 3. Location: C:\Program Files (x86)\AMD APP\tools\AMD APP Profiler 2.4\x64\sprofile.exe - 4. Arguments: - - `-o "${project_loc}\profiles\cltrace.txt" -k all -r -O -t -T` - - `-w "${project_loc}"` - - `"C:\Program Files\Java\jdk1.6.0_30\bin\java.exe"` - - `-Djava.library.path="lib\aparapi-2012-02-15"` - - `-jar "${project_loc}\runner.jar"` - - -9. Run the AMD profiler counter configuration to generate the counter profile. - - Run > External Tools > AMD counters - Project - - -10. Run the AMD profiler cltrace configuration to generate the cltrace and summary profiles. - - Run > External Tools > AMD cltrace - Project - A project file for testing the above instructions can be found http://code.google.com/p/aparapi/source/browse/trunk/wiki-collateral/ProfilingKernelsFormEclipseProject.zip - diff --git a/doc/README.md b/doc/README.md deleted file mode 100644 index 5bbba270ad043b42e9b3f6f532e5be7b200d0e0d..0000000000000000000000000000000000000000 --- a/doc/README.md +++ /dev/null @@ -1,46 +0,0 @@ -APARAPI Documentation -====================== - -| | | -|----------------|------| -| [PrivateMemorySpace](PrivateMemorySpace.md)| Using `__private` memory space in Aparapi kernels. | -| [SettingUpLinuxHSAMachineForAparapi](SettingUpLinuxHSAMachineForAparapi.md) | How to setup a Linux HSA machine for testing HSA enabled Aparapi | -| [PossibleAparapiLambdaSyntaxOptions](PossibleAparapiLambdaSyntaxOptions.md) | Syntax suggestions for HSA enabled Aparapi | -| [HSAEnablementOfLambdaBranchSidebar](HSAEnablementOfLambdaBranchSidebar.md)| Sidebar for HSAEnablementOfLambdaBranchAparapi| -| [HSAEnablementOfLambdaBranch](HSAEnablementOfLambdaBranch.md) | Adding HSA Support to Aparapi lambda branch | -| [UsingAparapiLambdaBranchWithHSASimulator](UsingAparapiLambdaBranchWithHSASimulator.md) | One-sentence summary of this page. | -| [SettingUpLinuxHSAMachineForAparapiSidebar](SettingUpLinuxHSAMachineForAparapiSidebar.md) | Sidebar for SettingUpLinuxHSAMachineForAparapi | -| HSASidebar | | -| [AddingLambdasToAparapi](AddingLambdasToAparapi.md) | Adding Java 8 Lambda Support to Aparapi | -| [ProfilingKernelExecution](ProfilingKernelExecution.md) | Using Aparapi's built in profiling APIs | -| [HowToAddUML](HowToAddUML.md) | How to add plantuml docs to wiki pages | -| [LIbraryAgentDuality](LIbraryAgentDuality.md) | Aparapi libraries can now be loaded as JVMTI agents. | -| [FrequentlyAskedQuestions](FrequentlyAskedQuestions.md) | Frequently Asked Questions| -| HomePageSuggestions || -| [ChoosingSpecificDevicesForExecution](ChoosingSpecificDevicesForExecution.md) | Using the new Device API's to choose Kernel execution on a specific device. | -| Gadgets | Gadgetorium| -| [ConvertingBytecodeToOpenCL](ConvertingBytecodeToOpenCL.md) | How Aparapi converts bytecode to OpenCL | -| [DevelopersGuideLinux](DevelopersGuideLinux.md) | Developer guide for Linux. | -| [DevelopersGuideWindows](DevelopersGuideWindows.md) | Developers guide for Windows. | -| [EmulatingMultipleEntrypointsUsingCurrentAPI](EmulatingMultipleEntrypointsUsingCurrentAPI.md) | How to emulate multiple entrypoints using existing Aparapi APIs | -| [MultipleEntryPointSupportProposal](MultipleEntryPointSupportProposal.md) | How to extend Aparapi to allow multiple entrypoints for kernels | -| [ExplicitBufferHandling](ExplicitBufferHandling.md) | How to minimize buffer transfers | -| [AparapiPatterns](AparapiPatterns.md) | Examples and code fragments to demonstrate Aparapi fetaures. | -| [ProfilingKernelsFromEclipse](ProfilingKernelsFromEclipse.md) | Profiling Kernels with AMD profiler in Eclipse (Indigo) | -| [DeviceProposal](DeviceProposal.md) | How we might use the extension mechanism devices for general Kernel execution.| -| [NewOpenCLBinding](NewOpenCLBinding.md) | How to use new OpenCL binding mechanism. | -| [AparapiExtensionProposal](AparapiExtensionProposal.md) | A proposed aparapi extension mechanism. | -| [UsingConstantMemory](UsingConstantMemory.md) | How to make use of constant memory in a Kernel | -| [UsingLocalMemory](UsingLocalMemory.md) | How to make use of local memory in a Kernel | -| [UsingMultiDimExecutionRanges](UsingMultiDimExecutionRanges.md) | How to use the new Range class (for multi-dim range access) | -| [AccessingMultiDimNDRangeProposal](AccessingMultiDimNDRangeProposal.md) | A proposal for accessing multi-dim ND range execution | -| LocalMemoryAndBarrierProposal | A proposal for handling local memory and barriers | -| [AddressSpacesUsingBuffers](AddressSpacesUsingBuffers.md) | Proposal For OpenCL address space support using java Buffers instead of arrays. | -| [BuildingNBody](BuildingNBody.md) | How to build the NBody example.| -| [UnitTestGuide](UnitTestGuide.md) | Unit test Guide Find out how to run Junit tests and how to add new tests. | -| [NewFeatures](NewFeatures.md) | New Features added to this open source release of Aparapi. | -| [UsersGuide](UsersGuide.md) | Aparapi User's Guide. | -| [DevelopersGuide](DevelopersGuide.md) | Aparapi developers guide. | -| [ContributionGuide](ContributionGuide.md) | How to contribute (bug fix or features). | -| [JavaKernelGuidelines](JavaKernelGuidelines.md) | What code can and can't be converted to OpenCL by Aparapi. | -| [Attribution](Attribution.md) | Attribution | diff --git a/doc/SettingUpLinuxHSAMachineForAparapi.md b/doc/SettingUpLinuxHSAMachineForAparapi.md deleted file mode 100644 index edf564be4e2766edb8db14ff4a4c36538af987b1..0000000000000000000000000000000000000000 --- a/doc/SettingUpLinuxHSAMachineForAparapi.md +++ /dev/null @@ -1,209 +0,0 @@ -#SettingUpLinuxHSAMachineForAparapi -*How to setup a Linux HSA machine for testing HSA enabled Aparapi Updated May 22, 2014 by frost.g...@gmail.com* - -* HSA Videos - * [http://www.youtube.com/watch?v=5ntILiXTuhE](http://www.youtube.com/watch?v=5ntILiXTuhE) - * [http://www.youtube.com/watch?v=caEPq4KvTTA](http://www.youtube.com/watch?v=caEPq4KvTTA) -* HSA Articles - * [http://developer.amd.com/resources/heterogeneous-computing/what-is-heterogeneous-computing/](http://developer.amd.com/resources/heterogeneous-computing/what-is-heterogeneous-computing/) -* HSA Foundation - * [https://github.com/HSAFoundation](https://github.com/HSAFoundation) - -##Introduction -Now that HSA hardware is generally available I figured it was time to describe how to setup a HSA enabled Linux platform so that it can run Aparapi. - -Here is a nice introduction to HSA [http://developer.amd.com/resources/heterogeneous-computing/what-is-heterogeneous-system-architecture-hsa/](http://developer.amd.com/resources/heterogeneous-computing/what-is-heterogeneous-system-architecture-hsa/) - -But for Aparapi users the main advantage is that we are no longer limited to the GPU memory for running GPU tasks. Also because the CPU and the GPU can both see the same memory (the Java heap) Aparapi code can now access Java objects directly. This removes a number of Aparapi constraints. So more of your code can now run on the GPU. - -##Hardware Required -These instructions were based on my experience setting up a platform using the following hardware. - -|Component | Suggested | -|---------------|---------------------------| -|APU | AMD A10-7850K APU [http://www.amd.com/us/products/desktop/processors/a-series/Pages/a-series-apu.aspx](http://www.amd.com/us/products/desktop/processors/a-series/Pages/a-series-apu.aspx) | -|Motherboard | ASUS A88X-PRO or A88XM-A [http://www.asus.com/Motherboards/A88XPRO](http://www.asus.com/Motherboards/A88XPRO) [http://www.asus.com/Motherboards/A88XMA](http://www.asus.com/Motherboards/A88XMA)| -| Memory | G.SKILL Ripjaws X Series 16GB (2 x 8GB) 240-Pin DDR3 SDRAM DDR3 2133| - -##Software Required -We also have some software dependencies. - -|Component | Suggested | -|---------------|-----------| -| Java 8 JDK | [http://www.oracle.com/technetwork/java/javase/downloads/ea-jsp-142245.html](http://www.oracle.com/technetwork/java/javase/downloads/ea-jsp-142245.html) | -| Ubuntu 13.10 64-bit edition | [http://www.ubuntu.com/download](http://www.ubuntu.com/download) | -| Ubuntu 13.10 64-bit edition HSA enabled kernel image | [https://github.com/HSAFoundation/Linux-HSA-Drivers-And-Images-AMD](https://github.com/HSAFoundation/Linux-HSA-Drivers-And-Images-AMD) | -| OKRA HSA enabled runtime | [https://github.com/HSAFoundation/Okra-Interface-to-HSA-Device](https://github.com/HSAFoundation/Okra-Interface-to-HSA-Device) | - -The hope is that the list of HW/SW support widens, but for early adopters this is the set of HW/SW we have been testing with. - -#Setting up your System -##Configure your BIOS to support IOMMU -Once you have built your AMD A10-7850K APU based system you should make sure that your system is configured to use IOMMU. - -Remember HSA allows the GPU and CPU cores to share the same memory. IOMMU needs to be enabled for this. - -##For the A88X-PRO board -For the recommended ASUS board above you will need to make sure that your BIOS is updated to version 0802. Here is a direct link to the 0802 version of the BIOS from ASUS's site as of 2/28/2014. - -[http://dlcdnet.asus.com/pub/ASUS/mb/SocketFM2/A88X-PRO/A88X-PRO-ASUS-0802.zip](http://dlcdnet.asus.com/pub/ASUS/mb/SocketFM2/A88X-PRO/A88X-PRO-ASUS-0802.zip) - -Once you have the latest BIOS you will need to enable IOMMU in the system BIOS. This is done using the "CPU Configuration" screen under "Advanced Mode" and then enabling IOMMU. - -##For the A88XM-A -You will need the 1102 (or later) version of the BIOS - -[http://dlcdnet.asus.com/pub/ASUS/mb/SocketFM2/A88XM-A/A88XM-A-ASUS-1102.zip](http://dlcdnet.asus.com/pub/ASUS/mb/SocketFM2/A88XM-A/A88XM-A-ASUS-1102.zip) - -Once you have the latest BIOS you will need to enable IOMMU in the system BIOS. This is done using the "CPU Configuration" screen under "Advanced Mode" and then enabling IOMMU. - -##Installing Ubuntu 13.10 -Once you have your BIOS setup you need to install Ubuntu [http://www.ubuntu.com/download](http://www.ubuntu.com/download) - -Installing HSA enabled kernel + driver -Until all of the HSA drivers and features are available in stock linux and have been pulled down into Ubuntu distro we will need a special HSA enabled kernel image. - -##A Ubuntu compatible kernel can be pulled from github - - $ cd ~ # I put all of this in my home dir - $ sudo apt-get install git - $ git clone https://github.com/HSAFoundation/Linux-HSA-Drivers-And-Images-AMD.git -Or you can pull the zip and unzip using curl if you don't have git - - $ cd ~ # I put all of this in my home dir - $ curl -L https://github.com/HSAFoundation/Linux-HSA-Drivers-And-Images-AMD/archive/master.zip > drivers.zip - $ unzip drivers.zip -This will create the following subdir on your machine - - Linux-HSA-Drivers-And-Images-AMD/ - LICENSE - README.md - ubuntu12.10-based-alpha1/ - xorg.conf - linux-image-3.13.0-kfd+_3.13.0-kfd+-2_amd64.deb - - -From here we can install our new image and setup the HSA KFD (the driver for HSA)and reboot to the new kernel. - - $ cd ~/Linux-HSA-Drivers-And-Images-AMD - $ echo "KERNEL==\"kfd\", MODE=\"0666\"" | sudo tee /etc/udev/rules.d/kfd.rules - $ sudo dpkg -i ubuntu13.10-based-alpha1/linux-image-3.13.0-kfd+_3.13.0-kfd+-2_amd64.deb - $ sudo cp ~/Linux-HSA-Drivers-And-Images-AMD/ubuntu13.10-based-alpha1/xorg.conf /etc/X11 - $ sudo reboot -##Installing OKRA RT -Now we need a runtime for executing HSAIL code. We share common infrastructure used by our sister OpenJDK project called Sumatra. Both Aparapi and Sumatra use OKRA to execute HSAIL code on a HSA enabled platform. - -We can get the latest version using of OKRA (Offloadable Kernel Runtime API) from another HSA foundation repository. - - $ cd ~ # I put all of this in my home dir - $ git clone https://github.com/HSAFoundation/Okra-Interface-to-HSA-Device.git -or if you prefer curl/unzip - - $ cd ~ # I put all of this in my home dir - $ curl -L https://github.com/HSAFoundation/Okra-Interface-to-HSA-Device/archive/master.zip > okra.zip - $ unzip okra.zip -This will create the following dir structure. - - Okra-Interface-to-HSA-Device/ - README.md - okra/ - README - dist/ - okra.jar - bin/ - libamdhsacl64.so - libnewhsacore64.so - libokra_x86_64.so - include/ - common.h - okraContext.h - - samples/ - dist/ - Squares - Squares.hsail - runSquares.sh - -OKRA offers a C API (for those that are so inclined ;) ) as well as a java jar file which contains JNI wrappers. - -##Sanity check your HSA and OKRA install -So to sanity check your install you can run a small sample app (binary) - - $ cd ~/Okra-Interface-to-HSA-Device/okra/samples/ - $ sh runSquares.sh -If everything is OK this should run the C Squares test app. - -Congratulations, you have executed your first HSA enabled app. - -Getting OpenCL headers and libraries -We need OpenCL headers and libraries to build Aparapi (remember we still support OpenCL). - -My recommendation is to download AMD-APP-SDK-v2.9-lnx64.tgz from [http://developer.amd.com/tools-and-sdks/heterogeneous-computing/amd-accelerated-parallel-processing-app-sdk/downloads](http://developer.amd.com/tools-and-sdks/heterogeneous-computing/amd-accelerated-parallel-processing-app-sdk/downloads) and extract the libraries and headers. - -Note that we have nested zipped jars in this archive. - - $ cd ~ - $ gunzip ~/Downloads/AMD-APP-SDK-v2.9-lnx64.tgz - $ tar xvf ~/Downloads/AMD-APP-SDK-v2.9-lnx64.tar - $ rm ~/default-install_lnx_64.pl ~/icd-registration.tgz ~/Install-AMD-APP.sh ~/ReadMe.txt - $ gunzip ~/AMD-APP-SDK-v2.9-RC-lnx64.tgz - $ tar xvf ~/AMD-APP-SDK-v2.9-RC-lnx64.tar - $ rm ~/AMD-APP-SDK-v2.9-RC-lnx64.tar - $ rm -rf AMD-APP-SDK-v2.9-RC-lnx64/samples -Note where AMD-APP-SDK-v2.9-RC-lnx64 is located, you need this in the following step. - -##You will need Java 8 -Download Java 8 JDK from [https://jdk8.java.net/download.html](https://jdk8.java.net/download.html) I chose to download the zipped tar and not install with RPM so I can control the location of the install. - - $ cd ~ - $ gunzip /home/gfrost/Downloads/jdk-8-fcs-bin-b132-linux-x64-04_mar_2014.tar.gz - $ tar xvf ~/Downloads/jdk-8-fcs-bin-b132-linux-x64-04_mar_2014.tar -I now have ~/jdk1.8.0 as my java 8 install dir. - -Alternatively the following will pull from Oracles site using curl - - $ cd ~ - $ curl http://download.java.net/jdk8/archive/b132/binaries/jdk-8-fcs-bin-b132-linux-x64-04_mar_2014.tar.gz?q=download/jdk8/archive/b132/binaries/jdk-8-fcs-bin-b132-linux-x64-04_mar_2014.tar.gz > jdk-8-fcs-bin-b132-linux-x64-04_mar_2014.tar.gz - $ gunzip jdk-8-fcs-bin-b132-linux-x64-04_mar_2014.tar.gz - $ tar xvf jdk-8-fcs-bin-b132-linux-x64-04_mar_2014.tar -I now have ~/jdk1.8.0 as my java 8 install dir. - -##You will need ant - $ sudo apt-get install ant -This takes a long time because in also installs a java7 jdk. - -##You will need g++ -We use g++ to build the JNI side of Aparapi - - $ sudo apt-get install g++ -##Pulling the HSA enabled Aparapi branch and building -Now we can pull the Aparapi lambda/HSA branch from SVN - - $ sudo apt-get install subversion - $ svn checkout https://aparapi.googlecode.com/svn/branches/lambda aparapi-lambda -If you are familiar with Aparapi structure then this tree should not be that much of a surprise but there are a few subtle changes. - -Specifically the build system has been changed to support OKRA, Aparapi JNI code is provided as a Java agent and the execution scripts all refer to ${APARAPI_HOME}/env.sh to setup a reasonable execution environment. - -You will need to edit env.sh and make sure that APARAPI_HOME, OKRA_HOME, OCL_HOME and JAVA_HOME correctly. - -Here are how I set my vars. - -|environment variable |value| -|-----------------------|-----| -|JAVA_HOME |/home/${LOGNAME}/jdk1.8.0| -|OCL_HOME |/home/${LOGNAME}/AMD-APP-SDK-v2.9-RC-lnx64| -|APARAPI_HOME |/home/${LOGNAME}/aparapi-lambda| -|OKRA_HOME |/home/${LOGNAME}/Okra-Interface-to-HSA-Device/okra/| - -It is recommended (thanks notzed ;) ) that you test your env.sh using sh env.sh until it stops reporting errors. Once you have finished I recommend sourcing it into your current shell before building with ant. - - $ cd ~aparapi-lambda - $ . env.sh - $ ant -If you get any problems check the env.sh vars first. - -If all is well you should be able to run some samples. - - $ cd ~/aparapi-lambda/samples/mandel - $ sh hsailmandel.sh \ No newline at end of file diff --git a/doc/SettingUpLinuxHSAMachineForAparapiSidebar.md b/doc/SettingUpLinuxHSAMachineForAparapiSidebar.md deleted file mode 100644 index 9d165df7e1fa5bd66761b5b95482d60225adb6ec..0000000000000000000000000000000000000000 --- a/doc/SettingUpLinuxHSAMachineForAparapiSidebar.md +++ /dev/null @@ -1,10 +0,0 @@ -#SettingUpLinuxHSAMachineForAparapiSidebar -*Sidebar for SettingUpLinuxHSAMachineForAparapi* - -* HSA Videos - * [http://www.youtube.com/watch?v=5ntILiXTuhE](http://www.youtube.com/watch?v=5ntILiXTuhE) - * [http://www.youtube.com/watch?v=caEPq4KvTTA](http://www.youtube.com/watch?v=caEPq4KvTTA) -* HSA Articles - * [http://developer.amd.com/resources/heterogeneous-computing/what-is-heterogeneous-computing/](http://developer.amd.com/resources/heterogeneous-computing/what-is-heterogeneous-computing/) -* HSA Foundation - * [https://github.com/HSAFoundation](https://github.com/HSAFoundation) \ No newline at end of file diff --git a/doc/UnitTestGuide.md b/doc/UnitTestGuide.md deleted file mode 100644 index 1f928f1c5e6e56b6f202d84dd384b1c75809bc65..0000000000000000000000000000000000000000 --- a/doc/UnitTestGuide.md +++ /dev/null @@ -1,174 +0,0 @@ -#UnitTestGuide -*Unit test Guide Find out how to run Junit tests and how to add new tests. Updated Sep 14, 2011 by frost.g...@gmail.com* - -#Unit Test Guide - -The Unit Test Guide explains the test infrastructure associated with Aparapi, including instructions for executing existing tests adding new test cases. -OpenCLâ„¢ code generation tests - -The initial open source tree includes the codegen subdirectory (test/codegen), which used to validate the Aparapi bytecode to OpenCLâ„¢ conversion. - - aparapi/trunk/ - com.syncleus.aparapi/ - src/java/com.syncleus.aparapi/ - build.xml - test/ - codegen/ - src/java/ - com.syncleus.aparapi/ - com.syncleus.aparapi.test/ - build.xml - build.xml - -The code generation tests to not require OpenCLâ„¢ , AMD APP SDK or a GPU devices to be configured; these tests only validate the creation of valid OpenCLâ„¢ code by comparing against predefined expected output. - -##Running the OpenCLâ„¢ code generation JUnit tests - -Before executing the code generation tests, build the com.syncleus.aparapi sub-project and ensure that you have JUnit 4 installed. - -Edit the junit.jar property in test/codegen/build.xml to point to your install directory. - - <property name="junit.jar" value="C:\JUnit4.9\junit-4.9.jar"/> - -Initiate the code generation tests using ant. - - C:\> cd tests/codegen - C:\> ant - <failures will be reported here> - C:> - -View the HTML version of the JUnit report at junit/html/index.html. On Microsoft Windows(r) platforms use - - C:\> start junit\html\index.html - -On Linux(r) platforms just invoke your browser (Firefox in this case). - - C:\> firefox junit\html\index.html - -##Adding a new OpenCLâ„¢ code generation test - -The test cases for OpenCLâ„¢ code generation are not strictly JUnit tests. Instead the codegen Java tree contains a tool (CreateJUnitTests) to create JUnit test cases from specially formatted test source files. - -The package `com.syncleus.aparapi.test (codegen/src/java/com/amd/aparapi/test)` contains all of the existing code generation tests. - -Here is an example that tests the code generation resulting from a call to Kernel.getPassId(), this is taken from com.syncleus.aparapi.test.CallGetPassId - - package com.syncleus.aparapi.test; - - import com.syncleus.aparapi.Kernel; - - public class CallGetPassId extends Kernel{ - public void run() { - int thePassId = getPassId(); - } - - } - /**{OpenCL{ - - typedef struct This_s{ - int passid; - }This; - int get_pass_id(This *this){ - return this->passid; - } - __kernel void run( - int passid - ){ - This thisStruct; - This* this=&thisStruct; - this->passid = passid; - { - int thePassId = get_pass_id(this); - return; - } - } - - }OpenCL}**/ - -The test source takes the form of a simple class that extends the kernel and a block of OpenCL code between the /**{OpenCL{ and }OpenCL}**/ markers. The code between these markers is the OpenCL code that we expect Aparapi to produce as a result of converting the run() method to OpenCL. - -The code-generating ant build.xml file performs the following steps to generate its report: - -* compiles the src/java tree. This compiles all the test cases as well as a few ‘utility’ classes. -* executes the com.syncleus.aparapi.test.CreateJUnitTests program. This iterates through all of the test source files and converts them to JUnit form. The generated source is written to the src/genjava tree. -* compiles the src/genjava tree to create the required JUnit classes -* initiates the JUnit test phase (result data in junit/data) -* creates the JUnit report (in junit/html/junit from junit/data) - -To create a new test case, just add your test case to the `codegen/src/java/com/amd/aparapi/test` package (including the expected OpenCL). - -Sometimes different javac implementations (such as Oracle and Eclipse) will generate different bytecode for the same source. When Aparapi converts this bytecode it may yield different (but equally acceptable) OpenCL forms. One example of this is the BooleanToggle test: - - public class BooleanToggle{ - public void run() { - boolean pass = false; - - pass = !pass; - - } - } - -The BooleanToggle test code creates two (slightly different) versions of OpenCLâ„¢ (sadly one line different) depending on the javac compiler. - -This example shows the ‘toggle’ OpenCLâ„¢ created from the bytecode generated by Oracle. - - pass = pass==1?0:1; - -This example shows the bytecode from Eclipse javac: - - pass = pass==0?1:0; - -Logically either of the above are correct. However, to accommodate the alternate acceptable forms we need to add two complete `/**{OpenCL{ and }OpenCL}**/` sections to the file. If either matches, the test will pass. - -Here is the complete BooleanToggle code. - - package com.syncleus.aparapi.test; - - public class BooleanToggle{ - public void run() { - boolean pass = false; - - pass = !pass; - - } - } - /**{OpenCL{ - typedef struct This_s{ - int passid; - }This; - int get_pass_id(This *this){ - return this->passid; - } - __kernel void run( - int passid - ){ - This thisStruct; - This* this=&thisStruct; - this->passid = passid; - { - char pass = 0; - pass = (pass==0)?1:0; - return; - } - } - }OpenCL}**/ - /**{OpenCL{ - typedef struct This_s{ - int passid; - }This; - int get_pass_id(This *this){ - return this->passid; - } - __kernel void run( - int passid - ){ - This thisStruct; - This* this=&thisStruct; - this->passid = passid; - { - char pass = 0; - pass = (pass!=0)?0:1; - return; - } - } - }OpenCL}**/ \ No newline at end of file diff --git a/doc/UsersGuide.md b/doc/UsersGuide.md deleted file mode 100644 index e9b1a0afda81fc3567d28d360643af19ea99160b..0000000000000000000000000000000000000000 --- a/doc/UsersGuide.md +++ /dev/null @@ -1,126 +0,0 @@ -#UsersGuide -*Aparapi User's Guide. Updated Sep 14, 2011 by frost.g...@gmail.com* -##User’s Guide -Aparapi is: An API used to express data parallel workloads in Java and a runtime system capable of running compatible workloads on a compatible GPU. - -Where your workload runs depends on - -Whether you have a compatible GPU and OpenCL capable device driver -Whether your Java parallel code can be converted to OpenCL by Aparapi -For information about restrictions on the code that Aparapi can convert to OpenCL, see JavaKernelGuidelines. -Aparapi depends on AMD’s OpenCLâ„¢ driver to execute on the GPU and therefore shares the same device, driver, and platform compatibility requirements as AMD APP SDK V2.5®. - -* 32-bit Microsoft® Windows® 7 -* 32-bit Microsoft® Windows Vista® SP2 -* 64-bit Microsoft® Windows® 7 -* 64-bit Microsoft® Windows Vista® SP2 -* 32-bit Linux® OpenSUSEâ„¢ 11.2, Ubuntu® 10.04/9.10, or Red Hat® Enterprise Linux® 5.5/5.4 -* 64-bit Linux® OpenSUSEâ„¢ 11.2, Ubuntu® 10.04/9.10, or Red Hat® Enterprise Linux® 5.5/5.4 -* An OpenCL GPU and suitable OpenCL enabled device driver -* An installed AMD APP SDK v2.5 or later - -If you prefer to test Aparapi in JTP mode (Java Thread Pool) then you will only need Aparapi.jar and Oracle Java 6 or later JRE or JDK. -The following fragment of Java code takes an input float array and populates an output array with the square of each element. - - final float in[8192]; // initialization of in[0..8191] omitted - final float out[in.length]; - - for(int i=0; i<in.length; i++){ - out[i]=in[i]*in[i]; - } -This code segment illustrates an ideal data parallel candidate, each pass through the loop is independent of the others. Traversing the loop in any order should provide the same result. - -To convert the above code to Aparapi we use an anonymous inner-class (a common Java idiom) to express the data parallel nature of the above sequential loop. - - Kernel kernel = new Kernel(){ - @Override public void run(){ - int i = getGlobalId(); - out[i]=in[i]*in[i]; - } - }; - kernel.execute(in.length); -Java developers should recognize the general pattern as similar to that used to launch a new Thread. - - Thread thread = new Thread(new Runnable(){ - @Override public void run(){ - System.out.println(“In another thread!â€); - } - }); - thread.start(); - thread.join(); -The Aparapi developer extends the com.syncleus.aparapi.Kernel and overrides the public void Kernel.run() method. It is this Kernel.run() method that is executed in parallel. - -The base class also exposes the Kernel.execute(range) method which is used to initiate the execution of Kernel.run() over the range 0...n. - -Kernel.execute(range) will block until execution has completed. Any code within the overridden ‘void run()’ method of Kernel (and indeed any method or methods reachable from that method) is assumed to be data-parallel and it is the developer’s responsibility to ensure that it is. Aparapi can neither detect nor enforce this. - -Within the executing kernel (on the GPU device or from the thread pool) the Kernel.getGlobalId() method is used to identify which (of the range 0..n) a particular execution represents. - -## Compiling an Aparapi application -Aparapi has only two compilation requirements: - -Aparapi.jar must be in the class path at compile time. -The generated class files must contain debug information (javac –g) -A typical compilation might be: - $ javac –g –cp ${APARAPI_DIR}/aparapi.jar Squares.java -Aparapi requires this classfile debug information so that can extract the name and scope of local variables for the generated OpenCL. - -## Running an Aparapi application -At runtime an Aparapi-enabled application requires aparapi.jar to be in the class path to be able to execute in a Java Thread Pool (no GPU offload). - - $ java–cp ${APARAPI_DIR}/aparapi.jar;. Squares -To take advantage of the GPU, the directory containing the platform-dependent Aparapi shared library is passed via the java.library.path property. - - $ java –Djava.library.path=${APARAPI_DIR} –cp ${APARAPI_DIR}/aparapi.jar;. Squares - -Aparapi detects whether the JNI shared library is available. If the library cannot be located your code will be executed using a Java Thread Pool. - -An application can detect whether a kernel was executed on the GPU or by a Java Thread Pool (JTP) by querying the execution mode ‘after’ Kernel.execute(range) has returned. This is achieved using the Kernel.getExecutionMode() method. - - Kernel kernel = new Kernel(){ - @Override public void run(){ - int i = getGlobalId(); - out[i]=in[i]*in[i]; - } - }; - kernel.execute(in.length); - if (!kernel.getExecutionMode().equals(Kernel.EXECUTION_MODE.GPU)){ - System.out.println(“Kernel nid not execute on the GPU!â€); - } - -To obtain a runtime report of the execution mode of all kernel executions, set the com.syncleus.aparapi.enableExecutionModeReporting property to true when the JVM is launched. - - $ java –Djava.library.path=${APARAPI_DIR} –Dcom.syncleus.aparapi.enableExecutionModeReporting=true –cp ${APARAPI_DIR}/aparapi.jar;. Squares - -##Running the sample applications -Aparapi includes two sample applications in the /samples subdirectory of the binary distribution zip file. - -samples/squares simple example that computes an array of squares of integers -samples/mandel computes and displays the Mandelbrot set -The jar file for each sample is included (so you can run a sample without having to build it) as well as both Linux® and Microsoft Windows® script files for launching the samples. - -You will need an appropriate GPU card, OpenCL® enabled Catalyst® driver and a compatible Oracle Java 6 JRE for your platform. To execute a sample: - -Set the environment variable JAVA_HOME to point to the root of your JRE or JDK. -Change to the appropriate samples directory (samples/squares or samples/mandel) -Run either the .bat or .sh script. On Linux® , you might have to initially chmod +x script.sh to add execute permissions. -The sample scripts pass the first arg (%1 or $1) to -Dcom.syncleus.aparapi.executionMode when the JVM is launched. This allows the sample to be tested in either GPU or JTP execution modes by passing the requested mode. - - $ cd samples/mandel - $ bash ./mandel.sh GPU - <executes in GPU mode here> - $ bash ./mandel.sh JTP - <executes in JTP mode here> - -## Building the sample applications -To build a sample, install Oracle® JDK 6 and Apache Ant (at least 1.7.1). - -Set the environment variable ANT_HOME to point to the root of your ant install. -Ensure that the %ANT_HOME%/bin or ${ANT_HOME}/bin is in your path. -Set the environment variable JAVA_HOME to point to the root of your JDK. -Change to the appropriate samples directory (sample/squares or sample/mandel). -Initiate a build using ant. - $ cd samples/mandel - $ ant - $ bash ./mandel.sh GPU -Attribution \ No newline at end of file diff --git a/doc/UsingAparapiLambdaBranchWithHSASimulator.md b/doc/UsingAparapiLambdaBranchWithHSASimulator.md deleted file mode 100644 index e4c7a68660f38c349fc13a633191984e5334d774..0000000000000000000000000000000000000000 --- a/doc/UsingAparapiLambdaBranchWithHSASimulator.md +++ /dev/null @@ -1,46 +0,0 @@ -#UsingAparapiLambdaBranchWithHSASimulator -*One-sentence summary of this page. Updated Feb 28, 2014 by frost.g...@gmail.com* - -##Introduction -Although HSA compatible devices are available, we understand that Aparapi developers may not have access to these devices. - -The HSA foundation has open sourced an LLVM based HSAIL emulator which we can use to test HSAIL generated code. - -The project is based here ([https://github.com/HSAFoundation/Okra-Interface-to-HSAIL-Simulator](https://github.com/HSAFoundation/Okra-Interface-to-HSAIL-Simulator)) but we have extracted detailed download and build instructions for Ubuntu below. - -Aparapi users/developers can use this simulator to test correctness. - -##Building the HSA Simulator on Ubuntu -We assume you have ant, svn and g++ available because you can build other aparapi artifacts. - -You will also need git, libelf-dev, libdwarf-dev, flex and cmake - - $ sudo apt-get install git libelf-dev libdwarf-dev flex cmake - -login... - - $ git clone https://github.com/HSAFoundation/Okra-Interface-to-HSAIL-Simulator.git okra - $ cd okra - $ ant -f build-okra-sim.xml - -##The build should take approximately 15 mins. - -How to setup and test an initial lambda/HSA enabled Aparapi build -Assuming you have built okra in /home/gfrost/okra - -Assuming your Java8 JDK is in /home/gfrost/jdk1.8.0 - -Assuming your aparapi svn trunk is /home/gfrost/aparapi - - $ export JAVA_HOME=/home/gfrost/jdk1.8.0 - $ export OKRA=/home/gfrost/okra - $ export PATH=${PATH}:${JAVA_HOME}/bin:${OKRA}/dist/bin - $ java -version - java version "1.8.0-ea" - Java(TM) SE Runtime Environment (build 1.8.0-ea-b94) - Java HotSpot(TM) 64-Bit Server VM (build 25.0-b36, mixed mode) - $ cd /home/gfrost/aparapi/branches/lambda - $ ant - $ export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${OKRA}/dist/bin - $ java -agentpath:com.syncleus.aparapi.jni/dist/libaparapi_x86_64.so -cp com.syncleus.aparapi/dist/aparapi.jar:${OKRA}/dist/okra.jar hsailtest.Squares - $ \ No newline at end of file diff --git a/doc/UsingConstantMemory.md b/doc/UsingConstantMemory.md deleted file mode 100644 index cc049d8f969cc653aec7865d76c2805e2438a3a5..0000000000000000000000000000000000000000 --- a/doc/UsingConstantMemory.md +++ /dev/null @@ -1,50 +0,0 @@ -#UsingConstantMemory -*How to make use of constant memory in a Kernel Updated Feb 28, 2012 by frost.g...@gmail.com* -##How to make use of new constant memory feature -By default all primitive arrays accessed by an Aparapi Kernel is considered global. If we look at the generated code using `-Dcom.syncleus.aparapi.enableShowGeneratedOpenCL=true` we will see that primitive arrays (such as `int buf[]`) are mapped to `__global` pointers (such as `__global int *buf`) in OpenCL. - -Although this makes Aparapi easy to use (especially to Java developers who are unfamiliar to tiered memory hierarchies), it does limit the ability of the 'power developer' wanting to extract more performance from Aparapi on the GPU. - -This [page](http://www.amd.com/us/products/technologies/stream-technology/opencl/pages/opencl-intro.aspx?cmpid=cp_article_2_2010) from AMD's website shows the different types of memory that OpenCL programmers can exploit. - -Global memory buffers in Aparapi (primitive Java arrays) are stored in host memory and are copied to Global memory (the RAM of the GPU card). - -Local memory is 'closer' to the compute devices and not copied from the host memory, it is just allocated for use on the device. The use of local memory on OpenCL can lead to much more performant code as the cost of fetching from local memory is much lower. - -Local memory is shared by all work item's (kernel instances) executing in the same group. This is why the use of local memory was deferred until we had a satisfactory mechanism for specifying a required group size. - -We recently also added support for constant memory for data that needs to be written once to the GPU but will not change. - -Aparapi only supports constant arrays, not scalers. - -##How to define a primitive array as "constant" -We have two ways define a constant buffer. Either we can decorate the variable name with a _$constant$ suffix (yes it is a valid identifier n Java). - - final int[] buffer = new int[1024]; // this is global accessable to all work items. - final int[] buffer_$constant$ = new int[]{1,2,3,4,5,6,7,8,9} // this is a constant buffer - - Kernel k = new Kernel(){ - public void run(){ - // access buffer - // access buffer_$constant$ - // .... - } - } - -Alternatively (if defining inside the derived Kernel class - cannot be used via anonymous inner class pattern above!) we can can use the @Constant annotation. - - final int[] buffer = new int[1024]; // this is global accessable to all work items. - - Kernel k = new Kernel(){ - @Constant int[] constantBuffer = new int[]{1,2,3,4,5,6,7,8,9} // this is a constant buffer - public void run(){ - // access buffer - // access constantBuffers - // .... - } - } - -##Can I see some code? -I updated the Mandelbrot example so that the pallete of RGB values is represented using constant memory, the source can be found here. Look at line #95. BTW for me this resulted in a 5-7 % performance improvement. - -[http://code.google.com/p/aparapi/source/browse/trunk/samples/mandel/src/com/amd/aparapi/sample/mandel/Main.java](tp://code.google.com/p/aparapi/source/browse/trunk/samples/mandel/src/com/amd/aparapi/sample/mandel/Main.java) \ No newline at end of file diff --git a/doc/UsingLocalMemory.md b/doc/UsingLocalMemory.md deleted file mode 100644 index a78594c4e500ead7b3dcda52c2de1198b8495950..0000000000000000000000000000000000000000 --- a/doc/UsingLocalMemory.md +++ /dev/null @@ -1,180 +0,0 @@ -#UsingLocalMemory -*How to make use of local memory in a Kernel Updated Feb 28, 2012 by frost.g...@gmail.com* -##How to make use of new local memory feature -By default all primitive arrays accessed by an Aparapi Kernel is considered global. If we look at the generated code using -Dcom.syncleus.aparapi.enableShowGeneratedOpenCL=true we will see that primitive arrays (such as int buf[]) are mapped to __global pointers (such as __global int *buf) in OpenCL. - -Although this makes Aparapi easy to use (especially to Java developers who are unfamiliar to tiered memory hierarchies), it does limit the ability of the 'power developer' wanting to extract more performance from Aparapi on the GPU. - -This [page](http://www.amd.com/us/products/technologies/stream-technology/opencl/pages/opencl-intro.aspx?cmpid=cp_article_2_2010) from AMD's website shows the different types of memory that OpenCL programmers can exploit. - -Global memory buffers in Aparapi (primitive Java arrays) are stored in host memory and are copied to Global memory (the RAM of the GPU card). - -Local memory is 'closer' to the compute devices and not copied from the host memory, it is just allocated for use on the device. The use of local memory on OpenCL can lead to much more performant code as the cost of fetching from local memory is much lower. - -Local memory is shared by all work item's (kernel instances) executing in the same group. This is why the use of local memory was deferred until we had a satisfactory mechanism for specifying a required group size. - -Aparapi only supports local arrays, not scalers. - -##How to define a primitive array as "local" -We have two ways define a local buffer. Either we can decorate the variable name with a _$local$ suffix (yes it is a valid identifier n Java). - - final int[] buffer = new int[1024]; // this is global accessable to all work items. - final int[] buffer_$local$ = new int[1024]; // this is a local buffer 1024 int's shared across all work item's in a group - - Kernel k = new Kernel(){ - public void run(){ - // access buffer - // access buffer_$local$ - localBarrier(); // allows all writes to buffer_$local$ to be synchronized across all work items in this group - // .... - } - } -Alternatively (if defining inside the derived Kernel class - cannot be used via anonymous inner class pattern above!) we can can use the @Local annotation. - - final int[] buffer = new int[1024]; // this is global accessable to all work items. - - Kernel k = new Kernel(){ - @Local int[] localBuffer = new int[1024]; // this is a local buffer 1024 int's shared across all work item's in a group - public void run(){ - // access buffer - // access localBuffer - localBarrier(); // allows all writes to localBuffer to be synchronized across all work items in this group - // .... - } - } -##How do I know how big to make my local buffer? -This is where the new Range class helps. - -If we create a Range using: - - Range rangeWithUndefinedGroupSize = Range.create(1024); -The Aparapi will pick a suitable group size. Generally this will be the highest factor of global size <= 256. So for a global size which is a power of two (and greater or equal to256 ;) ) the group size will be 256. - -Normally the size a local buffer will be some ratio of the group size. - -So if we needed 4 ints per group we might use a sequence such as. - - final int[] buffer = new int[8192]; // this is global accessable to all work items. - final Range range = Range.create(buffer.length); // let the runtime pick the group size - - Kernel k = new Kernel(){ - @Local int[] localBuffer = new int[range.getLocalSize(0)*4]; // this is a local buffer containing 4 ints per work item in the group - public void run(){ - // access buffer - // access localBuffer - localBarrier(); // allows all writes to localBuffer to be synchronized across all work items in this group - // .... - } - } -Alternatively you can of course specify your own group size when you create the Range. - - final int[] buffer = new int[8192]; // this is global accessable to all work items. - final Range range = Range.create(buffer.length,16); // we requested a group size of 16 - - Kernel k = new Kernel(){ - @Local int[] localBuffer = new int[range.getLocalSize(0)*4]; // this is a local buffer containing 4 ints per work item in the group = 64 ints - public void run(){ - // access buffer - // access localBuffer - localBarrier(); // allows all writes to localBuffer to be synchronized across all work items in this group - // .... - } - } -##Using barriers -As we mentioned above local memory buffers are shared by all work items/kernels executing in the same group. However, to read a value written by another workitem we need to insert a local barrier. - -A common pattern involves having each work item copying a value from global memory in local memory. - - Kernel k = new Kernel(){ - @Local int[] localBuffer = new int[range.getLocalSize(0)]; - public void run(){ - - localBuffer[getLocalId(0)] = globalBuffer[getGlobalId(0)]; - localBarrier(); // after this all kernels can see the data copied by other workitems in this group - // use localBuffer[0..getLocalSize(0)] - } - } -Without the barrier above, there is no guarantee that other work items will see mutations to localBuffer from other work items. - -Caution regarding barriers -Barriers can be dangerous. It is up to the developer to ensure that all kernels execute the same # of calls to localBarrier(). Be very careful with conditional code (or code containing loops!), to ensure that each kernel executes the same number of calls to localBarrier(). - -The following kernel will deadlock! - - Kernel kernel = new Kernel(){ - public void run(){ - if (getGlobalId(0)>10){ - // ... - localBarrier(); - // ... - } - } - } -We need to make sure that all kernel's in a group execute the localBarrier(). So the following will work. - - Kernel kernel = new Kernel(){ - public void run(){ - if (getGlobalId(0)>10){ - // ... - localBarrier(); - // ... - }else{ - localBarrier(); - } - - } - } -Of course if we have multiple calls to localBarrier() in the 'if' side of the if..then then we must match in the 'else'. - - Kernel kernel = new Kernel(){ - public void run(){ - if (getGlobalId(0)>10){ - // ... - localBarrier(); - // ... - localBarrier(); - // ... - }else{ - localBarrier(); - localBarrier(); - } - - } - } -With loops we must make sure that each kernel processes any loop the sam e # of times. - -So the following is fine. - - Kernel kernel = new Kernel(){ - public void run(){ - for (int i=0; i< 10; i++){ - // ... - localBarrier(); - // ... - } - } - } -However the following will deadlock - - Kernel kernel = new Kernel(){ - public void run(){ - for (int i=0; i< getLocalId(0); i++){ - // ... - localBarrier(); - // ... - } - } - } -As a testament to how well we emulate OpenCL in JTP mode, this will also deadlock your kernel in JTP mode ;) so be careful. - -Performance impact in JTP mode -Of course Java itself does not support local memory in any form. So any time code using local memory falls back to JTP mode we must expect a considerable performance degradation (try the NBody local example in JTP mode). - -We do honor localBarrier() using Java's barrier from the new concurrency utils. However, Java's memory model does not require the use of a barrier to observe array changes across threads. So these barriers are basically just an expense. - -I would recommend using local memory and barriers only if I am 90% sure the code will run on the GPU. - -##Can I see some code? -I added a version of NBody example which uses local memory, the source can be found here. - -[http://code.google.com/p/aparapi/source/browse/trunk/examples/nbody/src/com/amd/aparapi/examples/nbody/Local.java](http://code.google.com/p/aparapi/source/browse/trunk/examples/nbody/src/com/amd/aparapi/examples/nbody/Local.java) \ No newline at end of file diff --git a/doc/UsingMultiDimExecutionRanges.md b/doc/UsingMultiDimExecutionRanges.md deleted file mode 100644 index 99761c7eb3e233915ee0515fd2161a3ca5e1d722..0000000000000000000000000000000000000000 --- a/doc/UsingMultiDimExecutionRanges.md +++ /dev/null @@ -1,60 +0,0 @@ -#UsingMultiDimExecutionRanges -*How to use the new Range class (for multi-dim range access) Updated Feb 13, 2012 by frost.g...@gmail.com* - -Aparapi now allows developers to execute over one, two or three dimensional ranges. OpenCL natively allows the user to execute over 1, 2 or 3 dimension grids via the clEnqueueNDRangeKernel() method. - -Initially we chose not to expose 2D or 3D ranges (Aparapi's Kernel.execute(range) allowed only !d ranges, but following a specific request we added the notion of a Range via the new com.syncleus.aparapi.Range class. - -A range is created using various static factory methods. For example to create a simple range {0..1024} we would use. - -Range range = Range.create(1024); -In this case the range will span 1..1024 and a 'default' group size will be decided behind the scenes (256 probably in this case). - -If the user wishes to select a specific group size (say 32) for a one dimensional Range (0..1024) then they can use. - -Range range = Range.create(1024, 32); -The group size must always be a 'factor' of the global range. So globalRange % groupSize == 0 - -For a 2D range we use the Range.create2D(...) factory methods. - -Range range = Range.create2D(32, 32); -The above represents a 2D grid of execution 32 rows by 32 columns. In this case a default group size will be determined by the runtime. - -If we wish to specify the groupsize (say 4x4) then we can use. - - Range range = Range.create2D(32, 32, 4, 4); - This example uses a 2D range to apply a blurring convolution effect to a pixel buffer. - - final static int WIDTH=128; - final static int HEIGHT=64; - final int in[] = new int[WIDTH*HEIGHT]; - final int out[] = new int[WIDTH*HEIGHT]; - Kernel kernel = new Kernel(){ - public void run(){ - int x = getGlobalId(0); - int y = getGlobalId(1); - if (x>0 && x<(getGlobalSize(0)-1) && y>0 && y<(getGlobalSize(0)-1)){ - int sum = 0; - for (int dx =-1; dx<2; dx++){ - for (int dy =-1; dy<2; dy++){ - sum+=in[(y+dy)*getGlobalSize(0)+(x+dx)]; - } - } - out[y*getGlobalSize(0)+x] = sum/9; - } - } - - }; - Range range = Range.create2D(WIDTH, HEIGHT); - kernel.execute(range); - -##Handling this from JTP mode -Mapping to OpenCL for this is all fairly straightforward. - -In Java JTP mode we have to emulate the execution over the 1D, 2D and 3D ranges using threads. Note that the number of threads we launch is essentially the size of the group. So be careful creating large groups. - -If we ask for a 3D range using :- - - Range range = Range.create3D(1024, 1024, 1024, 8, 8, 8); - -We are asking for a group size of 8x8x8 == 512. So we are asking for 512 threads! \ No newline at end of file diff --git a/doc/uml.png b/doc/uml.png deleted file mode 100644 index 5dfc8690ae8500506d8337472ce5efae832de47c..0000000000000000000000000000000000000000 Binary files a/doc/uml.png and /dev/null differ diff --git a/examples/correlation-matrix/build.xml b/examples/correlation-matrix/build.xml index 52ef485609a2582a1ec43402405a97c9120811cd..3cdd75d8e4b5fb62b80ab551cc2e7a57325b5493 100644 --- a/examples/correlation-matrix/build.xml +++ b/examples/correlation-matrix/build.xml @@ -32,7 +32,7 @@ <property name="ant.build.javac.target" value="1.7" /> <path id="classpath"> - <pathelement path="${basedir}/../../com.syncleus.aparapi/dist/aparapi.jar" /> + <pathelement path="${basedir}/../../com.aparapi/dist/aparapi.jar" /> <pathelement path="${libs.root}/${commons.lang.jar}" /> <pathelement path="${libs.root}/${log4j.jar}" /> <pathelement path="${libs.root}/${lucene.jar}" /> @@ -79,7 +79,7 @@ <!-- Even though fork is slower we need to set the library path and this requires fork --> <junit printsummary="false" fork="true" haltonfailure="false" failureproperty="tests.failed" showoutput="true"> - <sysproperty key="java.library.path" value="${basedir}/../../com.syncleus.aparapi.jni/dist" /> + <sysproperty key="java.library.path" value="${basedir}/../../com.aparapi.jni/dist" /> <!-- USER DEFINED PROPERTIES --> <sysproperty key="numRows" value="1024" /> diff --git a/examples/correlation-matrix/src/java/gov/pnnl/aparapi/matrix/CorrMatrixHost.java b/examples/correlation-matrix/src/java/gov/pnnl/aparapi/matrix/CorrMatrixHost.java index 3569a9f41f607b6d0599777c814e38d2616d6b42..e2a5a2ce6bb492758dbb3385eddfa8f04be3da79 100644 --- a/examples/correlation-matrix/src/java/gov/pnnl/aparapi/matrix/CorrMatrixHost.java +++ b/examples/correlation-matrix/src/java/gov/pnnl/aparapi/matrix/CorrMatrixHost.java @@ -10,11 +10,11 @@ package gov.pnnl.aparapi.matrix; import org.apache.log4j.Logger; -import com.syncleus.aparapi.Kernel; -import com.syncleus.aparapi.Kernel.EXECUTION_MODE; -import com.syncleus.aparapi.Range; -import com.syncleus.aparapi.device.Device; -import com.syncleus.aparapi.device.OpenCLDevice; +import com.aparapi.Kernel; +import com.aparapi.Kernel.EXECUTION_MODE; +import com.aparapi.Range; +import com.aparapi.device.Device; +import com.aparapi.device.OpenCLDevice; /** * GPU calculations using OpenBitSet Intersection for OpenBitSets diff --git a/examples/correlation-matrix/src/java/gov/pnnl/aparapi/matrix/CorrMatrixKernel.java b/examples/correlation-matrix/src/java/gov/pnnl/aparapi/matrix/CorrMatrixKernel.java index da1bec4b0e0d5e57ef0139e34e5b0bffb58208d9..ba338a52726ef6d37326d176be173ec1afa5faad 100644 --- a/examples/correlation-matrix/src/java/gov/pnnl/aparapi/matrix/CorrMatrixKernel.java +++ b/examples/correlation-matrix/src/java/gov/pnnl/aparapi/matrix/CorrMatrixKernel.java @@ -8,7 +8,7 @@ */ package gov.pnnl.aparapi.matrix; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; /** * This kernel attempts to re-implement the Lucene OpenBitSet functionality on a GPU diff --git a/examples/correlation-matrix/src/test/gov/pnnl/aparapi/test/CorrMatrixTest.java b/examples/correlation-matrix/src/test/gov/pnnl/aparapi/test/CorrMatrixTest.java index bc4151bf1f10f48289b3d3e4524080a01dcde584..df57dce1f7bce82c1d9a010f4dd7deead1fa9a6a 100644 --- a/examples/correlation-matrix/src/test/gov/pnnl/aparapi/test/CorrMatrixTest.java +++ b/examples/correlation-matrix/src/test/gov/pnnl/aparapi/test/CorrMatrixTest.java @@ -25,7 +25,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.syncleus.aparapi.Kernel.EXECUTION_MODE; +import com.aparapi.Kernel.EXECUTION_MODE; /** * This test class performs the following functions: diff --git a/examples/movie/build.xml b/examples/movie/build.xml index 0aa4c9a5a0995619d3d3b1aac4f7d4ff83651d6b..bbfd7ae5d1e13d156cf6e41ae4ce6a3bf4315dc9 100644 --- a/examples/movie/build.xml +++ b/examples/movie/build.xml @@ -110,7 +110,7 @@ <mkdir dir="classes"/> <javac srcdir="src" destdir="classes" debug="on" includeantruntime="false" > <classpath> - <pathelement path="..\..\com.syncleus.aparapi\dist\aparapi.jar"/> + <pathelement path="..\..\com.aparapi\dist\aparapi.jar"/> <pathelement path="jjmpeg\jjmpeg-0.0\dist\jjmpeg.jar/"/> <pathelement path="..\jviolajones\jviolajones.jar/"/> </classpath> diff --git a/examples/movie/movie.bat b/examples/movie/movie.bat index 050eeb397ad64dd0ae47fb69ffe44d78e2b6d27d..9273c3c2fd573a6e2ed1b67d3f4dfc0a99f27df2 100644 --- a/examples/movie/movie.bat +++ b/examples/movie/movie.bat @@ -9,7 +9,7 @@ echo "win32!" set PATH=%PATH%;ffmpeg\ffmpeg-git-9c2651a-win32-shared\bin set PATH=%PATH%;jjmpeg\jjmpeg-0.0\native\mswin-i386 :win64 -set PATH=%PATH%;..\..\com.syncleus.aparapi.jni\dist -java -classpath jjmpeg\jjmpeg-0.0\dist\jjmpeg.jar;..\..\com.syncleus.aparapi\dist\aparapi.jar;movie.jar; com.syncleus.aparapi.examples.movie.%1 %2 +set PATH=%PATH%;..\..\com.aparapi.jni\dist +java -classpath jjmpeg\jjmpeg-0.0\dist\jjmpeg.jar;..\..\com.aparapi\dist\aparapi.jar;movie.jar; com.aparapi.examples.movie.%1 %2 ENDLOCAL diff --git a/examples/movie/src/com/amd/aparapi/examples/movie/AparapiSolution.java b/examples/movie/src/com/amd/aparapi/examples/movie/AparapiSolution.java index 05e6b7bdcac353216a90b4d63f2e3375ad3beb2f..29fdc9460a8ddd91d60c91c9f21c848bb83dcb65 100644 --- a/examples/movie/src/com/amd/aparapi/examples/movie/AparapiSolution.java +++ b/examples/movie/src/com/amd/aparapi/examples/movie/AparapiSolution.java @@ -35,14 +35,14 @@ of EAR). For the most current Country Group listings, or for additional informa under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. */ -package com.syncleus.aparapi.examples.movie; +package com.aparapi.examples.movie; import java.awt.Graphics2D; import java.awt.image.BufferedImage; import java.awt.image.DataBufferByte; -import com.syncleus.aparapi.Kernel; -import com.syncleus.aparapi.Range; +import com.aparapi.Kernel; +import com.aparapi.Range; public class AparapiSolution{ diff --git a/examples/movie/src/com/amd/aparapi/examples/movie/ConvMatrix3x3Editor.java b/examples/movie/src/com/amd/aparapi/examples/movie/ConvMatrix3x3Editor.java index 252cd74514cfd04fd680f8e054f17d729dd281cf..d3140806e23685e110f1c9ad90a908f54993cc2c 100644 --- a/examples/movie/src/com/amd/aparapi/examples/movie/ConvMatrix3x3Editor.java +++ b/examples/movie/src/com/amd/aparapi/examples/movie/ConvMatrix3x3Editor.java @@ -36,7 +36,7 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit */ -package com.syncleus.aparapi.examples.movie; +package com.aparapi.examples.movie; import java.awt.BorderLayout; import java.awt.Component; diff --git a/examples/movie/src/com/amd/aparapi/examples/movie/JJMPEGPlayer.java b/examples/movie/src/com/amd/aparapi/examples/movie/JJMPEGPlayer.java index bf3e362c9e54a48d0f6041513816442c3f213c6c..79f546b69c384bb88fc3e03c10c6e311c1b3503b 100644 --- a/examples/movie/src/com/amd/aparapi/examples/movie/JJMPEGPlayer.java +++ b/examples/movie/src/com/amd/aparapi/examples/movie/JJMPEGPlayer.java @@ -35,7 +35,7 @@ of EAR). For the most current Country Group listings, or for additional informa under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. */ -package com.syncleus.aparapi.examples.movie; +package com.aparapi.examples.movie; import java.awt.BorderLayout; import java.awt.Graphics; diff --git a/examples/movie/src/com/amd/aparapi/examples/movie/PureJavaSolution.java b/examples/movie/src/com/amd/aparapi/examples/movie/PureJavaSolution.java index b38b537117677cd017a4764bb795bd39a41ca5a0..a7b32024122f78e97ed6427ef839e47cd2c3c9c1 100644 --- a/examples/movie/src/com/amd/aparapi/examples/movie/PureJavaSolution.java +++ b/examples/movie/src/com/amd/aparapi/examples/movie/PureJavaSolution.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.examples.movie; +package com.aparapi.examples.movie; import java.awt.Graphics2D; import java.awt.image.ConvolveOp; diff --git a/examples/movie/src/com/amd/aparapi/examples/movie/ReferenceSolution.java b/examples/movie/src/com/amd/aparapi/examples/movie/ReferenceSolution.java index 09680219086725f8e12d55a23588537e638b99bc..1c39d1d032b607eb7610ffd697b4edadc9137d14 100644 --- a/examples/movie/src/com/amd/aparapi/examples/movie/ReferenceSolution.java +++ b/examples/movie/src/com/amd/aparapi/examples/movie/ReferenceSolution.java @@ -35,14 +35,14 @@ of EAR). For the most current Country Group listings, or for additional informa under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. */ -package com.syncleus.aparapi.examples.movie; +package com.aparapi.examples.movie; import java.awt.Graphics2D; import java.awt.image.BufferedImage; import java.awt.image.DataBufferByte; -import com.syncleus.aparapi.Kernel; -import com.syncleus.aparapi.Range; +import com.aparapi.Kernel; +import com.aparapi.Range; public class ReferenceSolution{ diff --git a/pom.xml b/pom.xml index f4eddb634a5c611d28d709b31d23aa450f6b7d05..8d545376b2177558b45ddddcd759cf1b7090c5e0 100644 --- a/pom.xml +++ b/pom.xml @@ -8,9 +8,9 @@ <version>3</version> </parent> - <groupId>com.syncleus.aparapi</groupId> + <groupId>com.aparapi</groupId> <artifactId>aparapi-examples</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>jar</packaging> <properties> @@ -33,7 +33,7 @@ <organization> <name>Syncleus</name> - <url>http://www.syncleus.com</url> + <url>http://syncleus.com</url> </organization> <scm> @@ -54,7 +54,7 @@ <email>Jeffrey.Freeman@Syncleus.com</email> <url>http://JeffreyFreeman.me</url> <organization>Syncleus</organization> - <organizationUrl>http://www.syncleus.com</organizationUrl> + <organizationUrl>http://www.aparapi.com</organizationUrl> <roles> <role>Chief Technology Officer</role> <role>Project Owner</role> @@ -79,7 +79,7 @@ <dependencies> <dependency> - <groupId>com.syncleus.aparapi</groupId> + <groupId>com.aparapi</groupId> <artifactId>aparapi</artifactId> <version>1.0.0</version> </dependency> @@ -102,10 +102,10 @@ <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <configuration> - <mainClass>com.syncleus.aparapi.examples.All</mainClass> + <mainClass>com.aparapi.examples.All</mainClass> <arguments> - <argument>com.syncleus.aparapi.executionMode=GPU</argument> - <argument>com.syncleus.aparapi.enableShowGeneratedOpenCL=true</argument> + <argument>com.aparapi.executionMode=GPU</argument> + <argument>com.aparapi.enableShowGeneratedOpenCL=true</argument> </arguments> </configuration> </plugin> diff --git a/src/main/java/com/syncleus/aparapi/examples/All.java b/src/main/java/com/syncleus/aparapi/examples/All.java index 084a40fbc59b6fba961d03d969210fee71c15062..86f05c867cc308edfe46fc0c8814a72a7b81fadb 100644 --- a/src/main/java/com/syncleus/aparapi/examples/All.java +++ b/src/main/java/com/syncleus/aparapi/examples/All.java @@ -8,7 +8,7 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples; +package com.aparapi.examples; import java.util.Scanner; @@ -80,106 +80,106 @@ public class All { switch(line) { case "1": - com.syncleus.aparapi.examples.life.Main.main(args); + com.aparapi.examples.life.Main.main(args); break; case "2": - com.syncleus.aparapi.examples.mandel.Main.main(args); + com.aparapi.examples.mandel.Main.main(args); break; case "3": - com.syncleus.aparapi.examples.mandel.Main2D.main(args); + com.aparapi.examples.mandel.Main2D.main(args); break; case "4": - com.syncleus.aparapi.examples.convolution.Convolution.main(args); + com.aparapi.examples.convolution.Convolution.main(args); break; case "5": - com.syncleus.aparapi.examples.convolution.ConvolutionOpenCL.main(args); + com.aparapi.examples.convolution.ConvolutionOpenCL.main(args); break; case "6": - com.syncleus.aparapi.examples.convolution.PureJava.main(args); + com.aparapi.examples.convolution.PureJava.main(args); break; case "7": - com.syncleus.aparapi.examples.blackscholes.Main.main(args); + com.aparapi.examples.blackscholes.Main.main(args); break; case "8": - com.syncleus.aparapi.examples.squares.Main.main(args); + com.aparapi.examples.squares.Main.main(args); break; case "9": - com.syncleus.aparapi.examples.progress.MultiPassKernelSwingWorkerDemo.main(args); + com.aparapi.examples.progress.MultiPassKernelSwingWorkerDemo.main(args); break; case "10": - com.syncleus.aparapi.examples.progress.ProgressAndCancelDemo.main(args); + com.aparapi.examples.progress.ProgressAndCancelDemo.main(args); break; case "11": - com.syncleus.aparapi.examples.info.Main.main(args); + com.aparapi.examples.info.Main.main(args); break; case "12": - com.syncleus.aparapi.examples.median.MedianDemo.main(args); + com.aparapi.examples.median.MedianDemo.main(args); break; case "13": - com.syncleus.aparapi.examples.mdarray.MDArray.main(args); + com.aparapi.examples.mdarray.MDArray.main(args); break; case "14": - com.syncleus.aparapi.examples.add.Main.main(args); + com.aparapi.examples.add.Main.main(args); break; case "15": - com.syncleus.aparapi.examples.extension.FFTExample.main(args); + com.aparapi.examples.extension.FFTExample.main(args); break; case "16": - com.syncleus.aparapi.examples.extension.Histogram.main(args); + com.aparapi.examples.extension.Histogram.main(args); break; case "17": - com.syncleus.aparapi.examples.extension.HistogramIdeal.main(args); + com.aparapi.examples.extension.HistogramIdeal.main(args); break; case "18": - com.syncleus.aparapi.examples.extension.MandelExample.main(args); + com.aparapi.examples.extension.MandelExample.main(args); break; case "19": - com.syncleus.aparapi.examples.extension.SquareExample.main(args); + com.aparapi.examples.extension.SquareExample.main(args); break; case "20": - com.syncleus.aparapi.examples.configuration.AutoCleanUpArraysDemo.main(args); + com.aparapi.examples.configuration.AutoCleanUpArraysDemo.main(args); break; case "21": - com.syncleus.aparapi.examples.configuration.CleanUpArraysDemo.main(args); + com.aparapi.examples.configuration.CleanUpArraysDemo.main(args); break; case "22": - com.syncleus.aparapi.examples.configuration.ConfigurationDemo.main(args); + com.aparapi.examples.configuration.ConfigurationDemo.main(args); break; case "23": - com.syncleus.aparapi.examples.configuration.CustomConfigurationDemo.main(args); + com.aparapi.examples.configuration.CustomConfigurationDemo.main(args); break; case "24": - com.syncleus.aparapi.examples.configuration.LegacyConfigurationDemo.main(args); + com.aparapi.examples.configuration.LegacyConfigurationDemo.main(args); break; case "25": - com.syncleus.aparapi.examples.configuration.ProfilingDemo.main(args); + com.aparapi.examples.configuration.ProfilingDemo.main(args); break; case "26": - com.syncleus.aparapi.examples.configuration.ProfilingDemoNoBinaryCaching.main(args); + com.aparapi.examples.configuration.ProfilingDemoNoBinaryCaching.main(args); break; case "27": - com.syncleus.aparapi.examples.effects.Main.main(args); + com.aparapi.examples.effects.Main.main(args); break; case "28": - com.syncleus.aparapi.examples.javaonedemo.Life.main(args); + com.aparapi.examples.javaonedemo.Life.main(args); break; case "29": - com.syncleus.aparapi.examples.javaonedemo.Mandel.main(args); + com.aparapi.examples.javaonedemo.Mandel.main(args); break; case "30": - com.syncleus.aparapi.examples.javaonedemo.NBody.main(args); + com.aparapi.examples.javaonedemo.NBody.main(args); break; case "31": - com.syncleus.aparapi.examples.nbody.Main.main(args); + com.aparapi.examples.nbody.Main.main(args); break; case "32": - com.syncleus.aparapi.examples.nbody.Local.main(args); + com.aparapi.examples.nbody.Local.main(args); break; case "33": - com.syncleus.aparapi.examples.nbody.Seq.main(args); + com.aparapi.examples.nbody.Seq.main(args); break; case "34": - com.syncleus.aparapi.examples.oopnbody.Main.main(args); + com.aparapi.examples.oopnbody.Main.main(args); break; default: System.out.println("Invalid selection."); diff --git a/src/main/java/com/syncleus/aparapi/examples/add/Main.java b/src/main/java/com/syncleus/aparapi/examples/add/Main.java index 336f8acb9b91c1b12e8689de351f8dfe253440c8..97a4c7e0d8e4aa459da55382b0c0aa4cc3c50b76 100644 --- a/src/main/java/com/syncleus/aparapi/examples/add/Main.java +++ b/src/main/java/com/syncleus/aparapi/examples/add/Main.java @@ -46,10 +46,10 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit */ -package com.syncleus.aparapi.examples.add; +package com.aparapi.examples.add; -import com.syncleus.aparapi.Kernel; -import com.syncleus.aparapi.Range; +import com.aparapi.Kernel; +import com.aparapi.Range; public class Main{ diff --git a/src/main/java/com/syncleus/aparapi/examples/blackscholes/Main.java b/src/main/java/com/syncleus/aparapi/examples/blackscholes/Main.java index 16c517220b92889acf84bff1cabd5eb2e3e995de..c462d201d873ab0b027118297b717e421afe0557 100644 --- a/src/main/java/com/syncleus/aparapi/examples/blackscholes/Main.java +++ b/src/main/java/com/syncleus/aparapi/examples/blackscholes/Main.java @@ -45,10 +45,10 @@ of EAR). For the most current Country Group listings, or for additional informa under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. */ -package com.syncleus.aparapi.examples.blackscholes; +package com.aparapi.examples.blackscholes; -import com.syncleus.aparapi.Kernel; -import com.syncleus.aparapi.Range; +import com.aparapi.Kernel; +import com.aparapi.Range; public class Main{ diff --git a/src/main/java/com/syncleus/aparapi/examples/configuration/AutoCleanUpArraysDemo.java b/src/main/java/com/syncleus/aparapi/examples/configuration/AutoCleanUpArraysDemo.java index 00178408262324df8fb4481d19a9c761569fde7f..79ee611ccf52a506d3838c308065bf479867f544 100644 --- a/src/main/java/com/syncleus/aparapi/examples/configuration/AutoCleanUpArraysDemo.java +++ b/src/main/java/com/syncleus/aparapi/examples/configuration/AutoCleanUpArraysDemo.java @@ -8,14 +8,14 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.configuration; +package com.aparapi.examples.configuration; -import com.syncleus.aparapi.examples.mandel.*; +import com.aparapi.examples.mandel.*; public class AutoCleanUpArraysDemo { public static void main(String[] ignored) { - System.setProperty("com.syncleus.aparapi.dumpProfileOnExecution", "true"); + System.setProperty("com.aparapi.dumpProfileOnExecution", "true"); int size = 1024; int[] rgbs = new int[size * size]; diff --git a/src/main/java/com/syncleus/aparapi/examples/configuration/CleanUpArraysDemo.java b/src/main/java/com/syncleus/aparapi/examples/configuration/CleanUpArraysDemo.java index 8e39e4dc6dde8fe0fd777356a83bd71c9e2887d3..746df162f304485c301f64c8edb1d2248424a8ac 100644 --- a/src/main/java/com/syncleus/aparapi/examples/configuration/CleanUpArraysDemo.java +++ b/src/main/java/com/syncleus/aparapi/examples/configuration/CleanUpArraysDemo.java @@ -8,17 +8,17 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.configuration; +package com.aparapi.examples.configuration; -import com.syncleus.aparapi.examples.mandel.*; +import com.aparapi.examples.mandel.*; public class CleanUpArraysDemo { public static void main(String[] ignored) { - System.setProperty("com.syncleus.aparapi.enableVerboseJNI", "true"); - System.setProperty("com.syncleus.aparapi.enableVerboseJNIOpenCLResourceTracking", "true"); - System.setProperty("com.syncleus.aparapi.enableExecutionModeReporting", "true"); - System.setProperty("com.syncleus.aparapi.dumpProfileOnExecution", "true"); + System.setProperty("com.aparapi.enableVerboseJNI", "true"); + System.setProperty("com.aparapi.enableVerboseJNIOpenCLResourceTracking", "true"); + System.setProperty("com.aparapi.enableExecutionModeReporting", "true"); + System.setProperty("com.aparapi.dumpProfileOnExecution", "true"); int size = 1024; int[] rgbs = new int[size * size]; diff --git a/src/main/java/com/syncleus/aparapi/examples/configuration/ConfigurationDemo.java b/src/main/java/com/syncleus/aparapi/examples/configuration/ConfigurationDemo.java index 0aef950c1d338cdd9339c5a44a9dc2d9ea2cde22..6ad8894c34a391005019ea3f673f0b848afb9477 100644 --- a/src/main/java/com/syncleus/aparapi/examples/configuration/ConfigurationDemo.java +++ b/src/main/java/com/syncleus/aparapi/examples/configuration/ConfigurationDemo.java @@ -8,15 +8,15 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.configuration; +package com.aparapi.examples.configuration; -import com.syncleus.aparapi.*; -import com.syncleus.aparapi.internal.kernel.*; +import com.aparapi.*; +import com.aparapi.internal.kernel.*; import java.util.*; /** - * Tests device selection via {@link com.syncleus.aparapi.internal.kernel.KernelManager}. + * Tests device selection via {@link com.aparapi.internal.kernel.KernelManager}. */ public class ConfigurationDemo { public static void main(String[] ignored) { diff --git a/src/main/java/com/syncleus/aparapi/examples/configuration/CustomConfigurationDemo.java b/src/main/java/com/syncleus/aparapi/examples/configuration/CustomConfigurationDemo.java index ad22f1fa0b2adea2db2fcd242e1e5de488eff13a..86f30f715b57ade158ac830700135668bd4e04ec 100644 --- a/src/main/java/com/syncleus/aparapi/examples/configuration/CustomConfigurationDemo.java +++ b/src/main/java/com/syncleus/aparapi/examples/configuration/CustomConfigurationDemo.java @@ -8,10 +8,10 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.configuration; +package com.aparapi.examples.configuration; -import com.syncleus.aparapi.device.*; -import com.syncleus.aparapi.internal.kernel.*; +import com.aparapi.device.*; +import com.aparapi.internal.kernel.*; import java.util.*; @@ -21,7 +21,7 @@ import java.util.*; public class CustomConfigurationDemo { public static void main(String[] ignored) { - System.setProperty("com.syncleus.aparapi.dumpProfilesOnExit", "true"); + System.setProperty("com.aparapi.dumpProfilesOnExit", "true"); KernelManager manager = new KernelManager() { @Override protected List<Device.TYPE> getPreferredDeviceTypes() { diff --git a/src/main/java/com/syncleus/aparapi/examples/configuration/KernelOkayInOpenCL.java b/src/main/java/com/syncleus/aparapi/examples/configuration/KernelOkayInOpenCL.java index c4f8b2b2e8780331dfbb32817e7f9cd4f48a806f..1e6dc5f80a30eda5b4cd372002bcc32af5c8fe93 100644 --- a/src/main/java/com/syncleus/aparapi/examples/configuration/KernelOkayInOpenCL.java +++ b/src/main/java/com/syncleus/aparapi/examples/configuration/KernelOkayInOpenCL.java @@ -8,12 +8,12 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.configuration; +package com.aparapi.examples.configuration; /** * Created by Barney on 24/08/2015. */ -public class KernelOkayInOpenCL extends com.syncleus.aparapi.Kernel { +public class KernelOkayInOpenCL extends com.aparapi.Kernel { char[] inChars = "KernelOkayInOpenCL".toCharArray(); char[] outChars = new char[inChars.length]; diff --git a/src/main/java/com/syncleus/aparapi/examples/configuration/KernelWithAlternateFallbackAlgorithm.java b/src/main/java/com/syncleus/aparapi/examples/configuration/KernelWithAlternateFallbackAlgorithm.java index e91947ff8f800bee674b72f7ddf9bd3818885ce6..e7d4cb590df976741748e91ec2f75612617cb0fa 100644 --- a/src/main/java/com/syncleus/aparapi/examples/configuration/KernelWithAlternateFallbackAlgorithm.java +++ b/src/main/java/com/syncleus/aparapi/examples/configuration/KernelWithAlternateFallbackAlgorithm.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.configuration; +package com.aparapi.examples.configuration; -import com.syncleus.aparapi.*; +import com.aparapi.*; /** * Kernel which will always fail to run on an OpenCLDevice but has an alternative fallback algorithm. diff --git a/src/main/java/com/syncleus/aparapi/examples/configuration/KernelWithoutAlternateFallbackAlgorithm.java b/src/main/java/com/syncleus/aparapi/examples/configuration/KernelWithoutAlternateFallbackAlgorithm.java index 13df43d507de3c4eb71cd1222ad0e15d86ef2351..8253af721212e6e72f1274a1a73fcdf4746b61ec 100644 --- a/src/main/java/com/syncleus/aparapi/examples/configuration/KernelWithoutAlternateFallbackAlgorithm.java +++ b/src/main/java/com/syncleus/aparapi/examples/configuration/KernelWithoutAlternateFallbackAlgorithm.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.configuration; +package com.aparapi.examples.configuration; -import com.syncleus.aparapi.*; +import com.aparapi.*; /** * Kernel which will always fail to run on an OpenCLDevice but has an alternative fallback algorithm. diff --git a/src/main/java/com/syncleus/aparapi/examples/configuration/LegacyConfigurationDemo.java b/src/main/java/com/syncleus/aparapi/examples/configuration/LegacyConfigurationDemo.java index e68967dd5c3f0eafbdfcc500f11e86c0a8e29749..02f8bfa732d9d07872f2ac39b0732754eb9b8c1e 100644 --- a/src/main/java/com/syncleus/aparapi/examples/configuration/LegacyConfigurationDemo.java +++ b/src/main/java/com/syncleus/aparapi/examples/configuration/LegacyConfigurationDemo.java @@ -8,21 +8,21 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.configuration; +package com.aparapi.examples.configuration; -import com.syncleus.aparapi.*; -import com.syncleus.aparapi.internal.kernel.*; +import com.aparapi.*; +import com.aparapi.internal.kernel.*; /** - * Tests device selection when circumventing the {@link com.syncleus.aparapi.internal.kernel.KernelManager} by using the legacy mechanism + * Tests device selection when circumventing the {@link com.aparapi.internal.kernel.KernelManager} by using the legacy mechanism * (setExecutionMode, etc.). */ public class LegacyConfigurationDemo { @SuppressWarnings("deprecation") public static void main(String[] ignored) { - System.setProperty("com.syncleus.aparapi.executionMode", "GPU,CPU,SEQ"); - System.setProperty("com.syncleus.aparapi.dumpProfilesOnExit", "true"); + System.setProperty("com.aparapi.executionMode", "GPU,CPU,SEQ"); + System.setProperty("com.aparapi.dumpProfilesOnExit", "true"); KernelWithAlternateFallbackAlgorithm kernel = new KernelWithAlternateFallbackAlgorithm(); kernel.setExecutionMode(Kernel.EXECUTION_MODE.GPU); diff --git a/src/main/java/com/syncleus/aparapi/examples/configuration/ProfilingDemo.java b/src/main/java/com/syncleus/aparapi/examples/configuration/ProfilingDemo.java index dcec233a65656152c73205ad14de84a83c50b664..202a83f3ae512befa5c795f0cec6280ca3446bfd 100644 --- a/src/main/java/com/syncleus/aparapi/examples/configuration/ProfilingDemo.java +++ b/src/main/java/com/syncleus/aparapi/examples/configuration/ProfilingDemo.java @@ -8,12 +8,12 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.configuration; +package com.aparapi.examples.configuration; -import com.syncleus.aparapi.*; -import com.syncleus.aparapi.internal.kernel.*; -import com.syncleus.aparapi.examples.blackscholes.Main.*; -import com.syncleus.aparapi.examples.mandel.*; +import com.aparapi.*; +import com.aparapi.internal.kernel.*; +import com.aparapi.examples.blackscholes.Main.*; +import com.aparapi.examples.mandel.*; /** * Demonstrate new enhanced profiling capability, profiling the kernel from the blackscholes sample. diff --git a/src/main/java/com/syncleus/aparapi/examples/configuration/ProfilingDemoNoBinaryCaching.java b/src/main/java/com/syncleus/aparapi/examples/configuration/ProfilingDemoNoBinaryCaching.java index 7ff4c23ec736e5e2cc712bd21e30e90434547c3d..ca0c36a8688bf689365b0a65139dd8f049ac8e2d 100644 --- a/src/main/java/com/syncleus/aparapi/examples/configuration/ProfilingDemoNoBinaryCaching.java +++ b/src/main/java/com/syncleus/aparapi/examples/configuration/ProfilingDemoNoBinaryCaching.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.configuration; +package com.aparapi.examples.configuration; -import com.syncleus.aparapi.internal.kernel.*; +import com.aparapi.internal.kernel.*; /** * Created by Barney on 13/09/2015. diff --git a/src/main/java/com/syncleus/aparapi/examples/convolution/ConvMatrix3x3Editor.java b/src/main/java/com/syncleus/aparapi/examples/convolution/ConvMatrix3x3Editor.java index 39a225047fd6748635c3df8ab3dc902711ad494b..9c0abc0c78d47375c4de6aad47932228e865b777 100644 --- a/src/main/java/com/syncleus/aparapi/examples/convolution/ConvMatrix3x3Editor.java +++ b/src/main/java/com/syncleus/aparapi/examples/convolution/ConvMatrix3x3Editor.java @@ -46,7 +46,7 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit */ -package com.syncleus.aparapi.examples.convolution; +package com.aparapi.examples.convolution; import java.awt.BorderLayout; import java.awt.Component; diff --git a/src/main/java/com/syncleus/aparapi/examples/convolution/Convolution.java b/src/main/java/com/syncleus/aparapi/examples/convolution/Convolution.java index 4e8a7f5266f7f210d59bc2189e6d818c4d7c6fe7..c7ed5495c9cb103a1acca3a1a3fa3ac80beb5e9c 100644 --- a/src/main/java/com/syncleus/aparapi/examples/convolution/Convolution.java +++ b/src/main/java/com/syncleus/aparapi/examples/convolution/Convolution.java @@ -46,9 +46,9 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit */ -package com.syncleus.aparapi.examples.convolution; +package com.aparapi.examples.convolution; -import com.syncleus.aparapi.*; +import com.aparapi.*; import java.io.*; diff --git a/src/main/java/com/syncleus/aparapi/examples/convolution/ConvolutionOpenCL.java b/src/main/java/com/syncleus/aparapi/examples/convolution/ConvolutionOpenCL.java index e611395dbd979236f43d3552c0d6c889f71f7cfd..1896c1996ed3253d1f36c969b311de9e0bc8e15b 100644 --- a/src/main/java/com/syncleus/aparapi/examples/convolution/ConvolutionOpenCL.java +++ b/src/main/java/com/syncleus/aparapi/examples/convolution/ConvolutionOpenCL.java @@ -46,19 +46,19 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit */ -package com.syncleus.aparapi.examples.convolution; +package com.aparapi.examples.convolution; -import com.syncleus.aparapi.*; -import com.syncleus.aparapi.device.*; -import com.syncleus.aparapi.internal.kernel.*; -import com.syncleus.aparapi.opencl.*; -import com.syncleus.aparapi.opencl.OpenCL.*; +import com.aparapi.*; +import com.aparapi.device.*; +import com.aparapi.internal.kernel.*; +import com.aparapi.opencl.*; +import com.aparapi.opencl.OpenCL.*; import java.io.*; public class ConvolutionOpenCL{ - @Resource("com/syncleus/aparapi/examples/convolution/convolution.cl") interface Convolution extends OpenCL<Convolution>{ + @Resource("com/aparapi/aparapi/examples/convolution/convolution.cl") interface Convolution extends OpenCL<Convolution>{ Convolution applyConvolution(// Range range, // @GlobalReadOnly("_convMatrix3x3") float[] _convMatrix3x3,//// only read from kernel diff --git a/src/main/java/com/syncleus/aparapi/examples/convolution/ConvolutionViewer.java b/src/main/java/com/syncleus/aparapi/examples/convolution/ConvolutionViewer.java index c5773344fa82f2e8146af1e8fd94f37a6c21e4fe..53cc34c12cce101884260e7284b12c228bf4d560 100644 --- a/src/main/java/com/syncleus/aparapi/examples/convolution/ConvolutionViewer.java +++ b/src/main/java/com/syncleus/aparapi/examples/convolution/ConvolutionViewer.java @@ -46,7 +46,7 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit */ -package com.syncleus.aparapi.examples.convolution; +package com.aparapi.examples.convolution; import java.awt.BorderLayout; import java.awt.Color; diff --git a/src/main/java/com/syncleus/aparapi/examples/convolution/PureJava.java b/src/main/java/com/syncleus/aparapi/examples/convolution/PureJava.java index 4ac820fb466899725d7770b263fc416eb50dc274..e76f313f68f28955b48d08f86036a63cbd350ddd 100644 --- a/src/main/java/com/syncleus/aparapi/examples/convolution/PureJava.java +++ b/src/main/java/com/syncleus/aparapi/examples/convolution/PureJava.java @@ -46,11 +46,11 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit */ -package com.syncleus.aparapi.examples.convolution; +package com.aparapi.examples.convolution; import java.io.File; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class PureJava{ diff --git a/src/main/java/com/syncleus/aparapi/examples/effects/Main.java b/src/main/java/com/syncleus/aparapi/examples/effects/Main.java index 3286f51b4ee544e4a58a6c0ad88e15316ab53b29..b64abba775b003f4712281e5ecf1bdccd62c7f0a 100644 --- a/src/main/java/com/syncleus/aparapi/examples/effects/Main.java +++ b/src/main/java/com/syncleus/aparapi/examples/effects/Main.java @@ -46,7 +46,7 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit */ -package com.syncleus.aparapi.examples.effects; +package com.aparapi.examples.effects; import java.awt.Color; import java.awt.Dimension; @@ -62,8 +62,8 @@ import java.awt.image.DataBufferInt; import javax.swing.JComponent; import javax.swing.JFrame; -import com.syncleus.aparapi.Kernel; -import com.syncleus.aparapi.Range; +import com.aparapi.Kernel; +import com.aparapi.Range; /** * An example Aparapi application which tracks the mouse and updates the color pallete of the window based on the distance from the mouse pointer. diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/FFTExample.java b/src/main/java/com/syncleus/aparapi/examples/extension/FFTExample.java index de3975e4cbaced84fc5da3c93f4734227023e915..9500dc355455df8ee23a3456a6494e265903077a 100644 --- a/src/main/java/com/syncleus/aparapi/examples/extension/FFTExample.java +++ b/src/main/java/com/syncleus/aparapi/examples/extension/FFTExample.java @@ -8,19 +8,19 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.extension; +package com.aparapi.examples.extension; -import com.syncleus.aparapi.*; -import com.syncleus.aparapi.device.*; -import com.syncleus.aparapi.internal.kernel.*; -import com.syncleus.aparapi.opencl.*; -import com.syncleus.aparapi.opencl.OpenCL.*; +import com.aparapi.*; +import com.aparapi.device.*; +import com.aparapi.internal.kernel.*; +import com.aparapi.opencl.*; +import com.aparapi.opencl.OpenCL.*; import java.util.*; public class FFTExample{ - @Resource("com/syncleus/aparapi/examples/extension/fft.cl") interface FFT extends OpenCL<FFT>{ + @Resource("com/aparapi/aparapi/examples/extension/fft.cl") interface FFT extends OpenCL<FFT>{ public FFT forward(// Range _range,// diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/Histogram.java b/src/main/java/com/syncleus/aparapi/examples/extension/Histogram.java index 3a57f14ee4cae479cb4f558c268979bd4f3752b3..b862072c8a4a15aed906c7ece4940e940c050327 100644 --- a/src/main/java/com/syncleus/aparapi/examples/extension/Histogram.java +++ b/src/main/java/com/syncleus/aparapi/examples/extension/Histogram.java @@ -8,18 +8,18 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.extension; +package com.aparapi.examples.extension; -import com.syncleus.aparapi.Kernel; -import com.syncleus.aparapi.Range; -import com.syncleus.aparapi.device.Device; -import com.syncleus.aparapi.device.OpenCLDevice; -import com.syncleus.aparapi.opencl.OpenCL; -import com.syncleus.aparapi.opencl.OpenCL.Resource; +import com.aparapi.Kernel; +import com.aparapi.Range; +import com.aparapi.device.Device; +import com.aparapi.device.OpenCLDevice; +import com.aparapi.opencl.OpenCL; +import com.aparapi.opencl.OpenCL.Resource; public class Histogram{ - @Resource("com/syncleus/aparapi/examples/extension/HistogramKernel.cl") interface HistogramKernel extends OpenCL<HistogramKernel>{ + @Resource("com/aparapi/aparapi/examples/extension/HistogramKernel.cl") interface HistogramKernel extends OpenCL<HistogramKernel>{ public HistogramKernel histogram256(// Range _range,// diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/HistogramIdeal.java b/src/main/java/com/syncleus/aparapi/examples/extension/HistogramIdeal.java index 888c78f25dddec7a9a8af3868283da5fe323d902..986f45f7014317a12f3ccc1de645291b1bfabb4e 100644 --- a/src/main/java/com/syncleus/aparapi/examples/extension/HistogramIdeal.java +++ b/src/main/java/com/syncleus/aparapi/examples/extension/HistogramIdeal.java @@ -8,17 +8,17 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.extension; +package com.aparapi.examples.extension; -import com.syncleus.aparapi.Range; -import com.syncleus.aparapi.device.Device; -import com.syncleus.aparapi.device.OpenCLDevice; -import com.syncleus.aparapi.internal.kernel.*; -import com.syncleus.aparapi.opencl.OpenCL; +import com.aparapi.Range; +import com.aparapi.device.Device; +import com.aparapi.device.OpenCLDevice; +import com.aparapi.internal.kernel.*; +import com.aparapi.opencl.OpenCL; public class HistogramIdeal{ - // @Resource("com/amd/aparapi/sample/extension/HistogramKernel.cl") + // @Resource("com/aparapi/sample/extension/HistogramKernel.cl") interface HistogramKernel extends OpenCL<HistogramKernel>{ public HistogramKernel histogram256(// @@ -63,7 +63,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("com/aparapi/sample/extension/HistogramKernel.cl")); long start = System.nanoTime(); histogram.begin()// .put(data)// diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/JavaMandelBrot.java b/src/main/java/com/syncleus/aparapi/examples/extension/JavaMandelBrot.java index e595e2ec570f56d699e7ce13e1195c17f6cf09f1..bb299d174cec1f44b72952d40bd279257ed8f3dc 100644 --- a/src/main/java/com/syncleus/aparapi/examples/extension/JavaMandelBrot.java +++ b/src/main/java/com/syncleus/aparapi/examples/extension/JavaMandelBrot.java @@ -8,12 +8,12 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.extension; +package com.aparapi.examples.extension; -import com.syncleus.aparapi.*; -import com.syncleus.aparapi.device.*; -import com.syncleus.aparapi.internal.kernel.*; -import com.syncleus.aparapi.opencl.*; +import com.aparapi.*; +import com.aparapi.device.*; +import com.aparapi.internal.kernel.*; +import com.aparapi.opencl.*; public class JavaMandelBrot extends OpenCLAdapter<MandelBrot> implements MandelBrot{ final int MAX_ITERATIONS = 64; diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/JavaMandelBrotMultiThread.java b/src/main/java/com/syncleus/aparapi/examples/extension/JavaMandelBrotMultiThread.java index 45a4fbb3993c366fdb51046fc156d073a59ee660..5dab1b4f7cdb22b20a1728e366ba502f522eedf3 100644 --- a/src/main/java/com/syncleus/aparapi/examples/extension/JavaMandelBrotMultiThread.java +++ b/src/main/java/com/syncleus/aparapi/examples/extension/JavaMandelBrotMultiThread.java @@ -8,15 +8,15 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.extension; +package com.aparapi.examples.extension; import java.util.concurrent.BrokenBarrierException; import java.util.concurrent.CyclicBarrier; -import com.syncleus.aparapi.*; -import com.syncleus.aparapi.device.*; -import com.syncleus.aparapi.internal.kernel.*; -import com.syncleus.aparapi.opencl.*; -import com.syncleus.aparapi.Range; +import com.aparapi.*; +import com.aparapi.device.*; +import com.aparapi.internal.kernel.*; +import com.aparapi.opencl.*; +import com.aparapi.Range; public class JavaMandelBrotMultiThread extends OpenCLAdapter<MandelBrot> implements MandelBrot{ final int MAX_ITERATIONS = 64; diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/Mandel.java b/src/main/java/com/syncleus/aparapi/examples/extension/Mandel.java index 59c29dab6d74967b32a40861ebe1dcc6ce75431a..7a106d4c0226cfc433febb1af71e0cc6a4072849 100644 --- a/src/main/java/com/syncleus/aparapi/examples/extension/Mandel.java +++ b/src/main/java/com/syncleus/aparapi/examples/extension/Mandel.java @@ -8,20 +8,20 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.extension; +package com.aparapi.examples.extension; -import com.syncleus.aparapi.*; -import com.syncleus.aparapi.device.*; -import com.syncleus.aparapi.internal.kernel.*; -import com.syncleus.aparapi.opencl.*; -import com.syncleus.aparapi.opencl.OpenCL.*; +import com.aparapi.*; +import com.aparapi.device.*; +import com.aparapi.internal.kernel.*; +import com.aparapi.opencl.*; +import com.aparapi.opencl.OpenCL.*; import javax.swing.*; import java.awt.*; import java.awt.event.*; import java.awt.image.*; import java.util.concurrent.*; -import com.syncleus.aparapi.opencl.OpenCL.Resource; +import com.aparapi.opencl.OpenCL.Resource; /** * An example Aparapi application which displays a view of the Mandelbrot set and lets the user zoom in to a particular point. @@ -34,9 +34,9 @@ import com.syncleus.aparapi.opencl.OpenCL.Resource; * */ -@Resource("com/syncleus/aparapi/examples/extension/mandel2.cl") -public interface Mandel extends OpenCL<com.syncleus.aparapi.examples.extension.Mandel>{ - com.syncleus.aparapi.examples.extension.Mandel createMandleBrot(// +@Resource("com/aparapi/aparapi/examples/extension/mandel2.cl") +public interface Mandel extends OpenCL<com.aparapi.examples.extension.Mandel>{ + com.aparapi.examples.extension.Mandel createMandleBrot(// Range range,// @Arg("scale") float scale, // @Arg("offsetx") float offsetx, // diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/MandelBrot.java b/src/main/java/com/syncleus/aparapi/examples/extension/MandelBrot.java index 691727e51ed18d5e965162f078699756dbeea15f..da2eacf492e04f95f3da8dc14bb28315c0efb9db 100644 --- a/src/main/java/com/syncleus/aparapi/examples/extension/MandelBrot.java +++ b/src/main/java/com/syncleus/aparapi/examples/extension/MandelBrot.java @@ -8,13 +8,13 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.extension; +package com.aparapi.examples.extension; -import com.syncleus.aparapi.*; -import com.syncleus.aparapi.device.*; -import com.syncleus.aparapi.internal.kernel.*; -import com.syncleus.aparapi.opencl.*; -import com.syncleus.aparapi.opencl.OpenCL.Resource; +import com.aparapi.*; +import com.aparapi.device.*; +import com.aparapi.internal.kernel.*; +import com.aparapi.opencl.*; +import com.aparapi.opencl.OpenCL.Resource; /** * An example Aparapi application which displays a view of the Mandelbrot set and lets the user zoom in to a particular point. @@ -27,7 +27,7 @@ import com.syncleus.aparapi.opencl.OpenCL.Resource; * */ -@Resource("com/syncleus/aparapi/examples/extension/mandel2.cl") +@Resource("com/aparapi/aparapi/examples/extension/mandel2.cl") public interface MandelBrot extends OpenCL<MandelBrot>{ MandelBrot createMandleBrot(// Range range,// diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/MandelExample.java b/src/main/java/com/syncleus/aparapi/examples/extension/MandelExample.java index 27394d96b684cfda0126513e2492f12b8f84a6ea..bcf244ffb0c136f1d2c5b4800a1e45bcc321ecb0 100644 --- a/src/main/java/com/syncleus/aparapi/examples/extension/MandelExample.java +++ b/src/main/java/com/syncleus/aparapi/examples/extension/MandelExample.java @@ -46,13 +46,13 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit */ -package com.syncleus.aparapi.examples.extension; +package com.aparapi.examples.extension; -import com.syncleus.aparapi.*; -import com.syncleus.aparapi.device.*; -import com.syncleus.aparapi.internal.kernel.*; -import com.syncleus.aparapi.opencl.*; -import com.syncleus.aparapi.opencl.OpenCL.*; +import com.aparapi.*; +import com.aparapi.device.*; +import com.aparapi.internal.kernel.*; +import com.aparapi.opencl.*; +import com.aparapi.opencl.OpenCL.*; import javax.swing.*; import java.awt.*; diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/MandelSimple.java b/src/main/java/com/syncleus/aparapi/examples/extension/MandelSimple.java index b976e2d6c9e2c65ec2b0b0f30ff5873c50916ba4..ec895fa2cc1aabc4049583010db33fdca262748e 100644 --- a/src/main/java/com/syncleus/aparapi/examples/extension/MandelSimple.java +++ b/src/main/java/com/syncleus/aparapi/examples/extension/MandelSimple.java @@ -46,14 +46,14 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit */ -package com.syncleus.aparapi.examples.extension; - -import com.syncleus.aparapi.device.*; -import com.syncleus.aparapi.examples.extension.Mandel; -import com.syncleus.aparapi.internal.kernel.*; -import com.syncleus.aparapi.opencl.*; -import com.syncleus.aparapi.opencl.OpenCL.*; -import com.syncleus.aparapi.Range; +package com.aparapi.examples.extension; + +import com.aparapi.device.*; +import com.aparapi.examples.extension.Mandel; +import com.aparapi.internal.kernel.*; +import com.aparapi.opencl.*; +import com.aparapi.opencl.OpenCL.*; +import com.aparapi.Range; import javax.swing.*; import java.awt.*; diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/Pow4Example.java b/src/main/java/com/syncleus/aparapi/examples/extension/Pow4Example.java index 67bad08a6defcffae0a32b1b732caeafc0d13831..6e065d797aa1657bdfe87985fbb114f27fc8148a 100644 --- a/src/main/java/com/syncleus/aparapi/examples/extension/Pow4Example.java +++ b/src/main/java/com/syncleus/aparapi/examples/extension/Pow4Example.java @@ -8,18 +8,18 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.extension; +package com.aparapi.examples.extension; -import com.syncleus.aparapi.Range; -import com.syncleus.aparapi.device.Device; -import com.syncleus.aparapi.device.OpenCLDevice; -import com.syncleus.aparapi.internal.kernel.*; -import com.syncleus.aparapi.opencl.OpenCL; -import com.syncleus.aparapi.opencl.OpenCL.Resource; +import com.aparapi.Range; +import com.aparapi.device.Device; +import com.aparapi.device.OpenCLDevice; +import com.aparapi.internal.kernel.*; +import com.aparapi.opencl.OpenCL; +import com.aparapi.opencl.OpenCL.Resource; public class Pow4Example{ - @Resource("com/syncleus/aparapi/examples/extension/squarer.cl") + @Resource("com/aparapi/aparapi/examples/extension/squarer.cl") interface Squarer extends OpenCL<Squarer>{ public Squarer square(// diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/SquareExample.java b/src/main/java/com/syncleus/aparapi/examples/extension/SquareExample.java index cb9efe4144d1824afa4f91f3101607c604f5dfe2..7361d9497d9317dccd41e339d02f394abe91a230 100644 --- a/src/main/java/com/syncleus/aparapi/examples/extension/SquareExample.java +++ b/src/main/java/com/syncleus/aparapi/examples/extension/SquareExample.java @@ -8,16 +8,16 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.extension; +package com.aparapi.examples.extension; -import com.syncleus.aparapi.ProfileInfo; -import com.syncleus.aparapi.Range; -import com.syncleus.aparapi.device.Device; -import com.syncleus.aparapi.device.OpenCLDevice; -import com.syncleus.aparapi.internal.kernel.*; -import com.syncleus.aparapi.opencl.OpenCL; -import com.syncleus.aparapi.opencl.OpenCL.Resource; -import com.syncleus.aparapi.opencl.OpenCL.Source; +import com.aparapi.ProfileInfo; +import com.aparapi.Range; +import com.aparapi.device.Device; +import com.aparapi.device.OpenCLDevice; +import com.aparapi.internal.kernel.*; +import com.aparapi.opencl.OpenCL; +import com.aparapi.opencl.OpenCL.Resource; +import com.aparapi.opencl.OpenCL.Source; import java.util.List; public class SquareExample{ @@ -33,7 +33,7 @@ public class SquareExample{ @GlobalReadWrite("out") float[] out); } - @Resource("com/syncleus/aparapi/examples/extension/squarer.cl") interface SquarerWithResource extends OpenCL<SquarerWithResource>{ + @Resource("com/aparapi/aparapi/examples/extension/squarer.cl") interface SquarerWithResource extends OpenCL<SquarerWithResource>{ public SquarerWithResource square(// Range _range,// @GlobalReadWrite("in") float[] in,// diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/StopWatch.java b/src/main/java/com/syncleus/aparapi/examples/extension/StopWatch.java index eb32e1e62496e266007b875be0dbc14ea89f9fba..a5ac4b26913f59785258a452a26ab0f5f07ce267 100644 --- a/src/main/java/com/syncleus/aparapi/examples/extension/StopWatch.java +++ b/src/main/java/com/syncleus/aparapi/examples/extension/StopWatch.java @@ -8,7 +8,7 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.extension; +package com.aparapi.examples.extension; public class StopWatch{ long start = 0L; diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/SwapExample.java b/src/main/java/com/syncleus/aparapi/examples/extension/SwapExample.java index dbb87fa0e6a27d679aa28d37e4a765beabd66aac..beafe59ad180bfafb16f8a8dd3f34e325cf92c69 100644 --- a/src/main/java/com/syncleus/aparapi/examples/extension/SwapExample.java +++ b/src/main/java/com/syncleus/aparapi/examples/extension/SwapExample.java @@ -8,13 +8,13 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.extension; +package com.aparapi.examples.extension; -import com.syncleus.aparapi.Range; -import com.syncleus.aparapi.device.Device; -import com.syncleus.aparapi.device.OpenCLDevice; -import com.syncleus.aparapi.internal.kernel.*; -import com.syncleus.aparapi.opencl.OpenCL; +import com.aparapi.Range; +import com.aparapi.device.Device; +import com.aparapi.device.OpenCLDevice; +import com.aparapi.internal.kernel.*; +import com.aparapi.opencl.OpenCL; public class SwapExample{ diff --git a/src/main/java/com/syncleus/aparapi/examples/info/Main.java b/src/main/java/com/syncleus/aparapi/examples/info/Main.java index 9d560b34926fa1561c8fb1e1896417b3909ce99f..0b83513365e380c17fe3ef469a33707dd8d96446 100644 --- a/src/main/java/com/syncleus/aparapi/examples/info/Main.java +++ b/src/main/java/com/syncleus/aparapi/examples/info/Main.java @@ -46,17 +46,17 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit */ -package com.syncleus.aparapi.examples.info; +package com.aparapi.examples.info; -import com.syncleus.aparapi.device.*; -import com.syncleus.aparapi.internal.kernel.*; -import com.syncleus.aparapi.internal.opencl.*; +import com.aparapi.device.*; +import com.aparapi.internal.kernel.*; +import com.aparapi.internal.opencl.*; import java.util.*; public class Main{ public static void main(String[] _args) { - System.out.println("com.syncleus.aparapi.examples.info.Main"); + System.out.println("com.aparapi.examples.info.Main"); List<OpenCLPlatform> platforms = (new OpenCLPlatform()).getOpenCLPlatforms(); System.out.println("Machine contains " + platforms.size() + " OpenCL platforms"); int platformc = 0; diff --git a/src/main/java/com/syncleus/aparapi/examples/javaonedemo/Life.java b/src/main/java/com/syncleus/aparapi/examples/javaonedemo/Life.java index d7f471b10c3ae02f400b852b1f00b599b0c73396..c05592592812eda3b66fd8da0e29b2412d977364 100644 --- a/src/main/java/com/syncleus/aparapi/examples/javaonedemo/Life.java +++ b/src/main/java/com/syncleus/aparapi/examples/javaonedemo/Life.java @@ -46,7 +46,7 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit */ -package com.syncleus.aparapi.examples.javaonedemo; +package com.aparapi.examples.javaonedemo; import java.awt.BorderLayout; import java.awt.Color; @@ -70,9 +70,9 @@ import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.WindowConstants; -import com.syncleus.aparapi.Kernel; -import com.syncleus.aparapi.ProfileInfo; -import com.syncleus.aparapi.Range; +import com.aparapi.Kernel; +import com.aparapi.ProfileInfo; +import com.aparapi.Range; /** * An example Aparapi application which demonstrates Conways 'Game Of Life'. diff --git a/src/main/java/com/syncleus/aparapi/examples/javaonedemo/Mandel.java b/src/main/java/com/syncleus/aparapi/examples/javaonedemo/Mandel.java index 84ad938470213a6d23f994ab4fdba67172f28aca..fe73d36054ba368edfe861f7f4cc4cba5b06b5f6 100644 --- a/src/main/java/com/syncleus/aparapi/examples/javaonedemo/Mandel.java +++ b/src/main/java/com/syncleus/aparapi/examples/javaonedemo/Mandel.java @@ -46,7 +46,7 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit */ -package com.syncleus.aparapi.examples.javaonedemo; +package com.aparapi.examples.javaonedemo; import java.awt.BorderLayout; import java.awt.Color; @@ -70,10 +70,10 @@ import javax.swing.JComponent; import javax.swing.JFrame; import javax.swing.JPanel; -import com.syncleus.aparapi.annotation.*; -import com.syncleus.aparapi.Kernel; -import com.syncleus.aparapi.ProfileInfo; -import com.syncleus.aparapi.Range; +import com.aparapi.annotation.*; +import com.aparapi.Kernel; +import com.aparapi.ProfileInfo; +import com.aparapi.Range; /** * An example Aparapi application which displays a view of the Mandelbrot set and lets the user zoom in to a particular point. diff --git a/src/main/java/com/syncleus/aparapi/examples/javaonedemo/NBody.java b/src/main/java/com/syncleus/aparapi/examples/javaonedemo/NBody.java index a06d8e0d525da9887efcfe86bfc18d960953ded4..0bdc8d2d438831077ac69377f52a5b398f773fad 100644 --- a/src/main/java/com/syncleus/aparapi/examples/javaonedemo/NBody.java +++ b/src/main/java/com/syncleus/aparapi/examples/javaonedemo/NBody.java @@ -45,7 +45,7 @@ of EAR). For the most current Country Group listings, or for additional informa under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. */ -package com.syncleus.aparapi.examples.javaonedemo; +package com.aparapi.examples.javaonedemo; import java.awt.BorderLayout; import java.awt.Dimension; @@ -75,9 +75,9 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.WindowConstants; -import com.syncleus.aparapi.Kernel; -import com.syncleus.aparapi.ProfileInfo; -import com.syncleus.aparapi.Range; +import com.aparapi.Kernel; +import com.aparapi.ProfileInfo; +import com.aparapi.Range; import com.jogamp.opengl.util.FPSAnimator; import com.jogamp.opengl.util.gl2.GLUT; import com.jogamp.opengl.util.texture.Texture; diff --git a/src/main/java/com/syncleus/aparapi/examples/life/Main.java b/src/main/java/com/syncleus/aparapi/examples/life/Main.java index 09f05c4c621d93bfcfc9431b5e071d4e6abcf8c1..263b906148c9741a2a6750a6c0c01ac8bde1c4ce 100644 --- a/src/main/java/com/syncleus/aparapi/examples/life/Main.java +++ b/src/main/java/com/syncleus/aparapi/examples/life/Main.java @@ -46,10 +46,10 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit */ -package com.syncleus.aparapi.examples.life; +package com.aparapi.examples.life; -import com.syncleus.aparapi.Kernel; -import com.syncleus.aparapi.*; +import com.aparapi.Kernel; +import com.aparapi.*; import javax.swing.*; import java.awt.*; @@ -113,7 +113,7 @@ public class Main{ width = _width; height = _height; - final String executionMode = System.getProperty("com.syncleus.aparapi.executionMode"); + final String executionMode = System.getProperty("com.aparapi.executionMode"); if ((executionMode != null) && executionMode.equals("JTP")) { range = Range.create(width * height, 4); } else { diff --git a/src/main/java/com/syncleus/aparapi/examples/mandel/Main.java b/src/main/java/com/syncleus/aparapi/examples/mandel/Main.java index c70ca65dfa97e34a4495577d67a1ea4cfeac7238..a9bd900d14927b9fd83485d7479e0064df1230cf 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mandel/Main.java +++ b/src/main/java/com/syncleus/aparapi/examples/mandel/Main.java @@ -46,10 +46,10 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit */ -package com.syncleus.aparapi.examples.mandel; +package com.aparapi.examples.mandel; -import com.syncleus.aparapi.Kernel; -import com.syncleus.aparapi.*; +import com.aparapi.Kernel; +import com.aparapi.*; import javax.swing.*; import java.awt.*; @@ -71,7 +71,7 @@ import java.util.List; public class Main{ static { - System.setProperty("com.syncleus.aparapi.dumpProfilesOnExit", "true"); + System.setProperty("com.aparapi.dumpProfilesOnExit", "true"); // KernelManager.setKernelManager(new KernelManager() { // @Override // protected List<Device.TYPE> getPreferredDeviceTypes() { diff --git a/src/main/java/com/syncleus/aparapi/examples/mandel/Main2D.java b/src/main/java/com/syncleus/aparapi/examples/mandel/Main2D.java index 46114eb40b587b965f4d88cdb2c3d2d582601dc1..782f27be6c67aa74dca679d5343a922cb42c03fe 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mandel/Main2D.java +++ b/src/main/java/com/syncleus/aparapi/examples/mandel/Main2D.java @@ -46,10 +46,10 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit */ -package com.syncleus.aparapi.examples.mandel; +package com.aparapi.examples.mandel; -import com.syncleus.aparapi.Kernel; -import com.syncleus.aparapi.*; +import com.aparapi.Kernel; +import com.aparapi.*; import javax.swing.*; import java.awt.*; diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul1D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul1D.java index 30515e70961fd6f684a6d8c583a49f7b0107dcd9..82e5180b471687dcd70747df98aaa5918c57f477 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul1D.java +++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul1D.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.mdarray; +package com.aparapi.examples.mdarray; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class BMatMul1D extends Kernel{ byte[] A; diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul2D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul2D.java index d03e80c91b3b398eb4d25f40819eba6c105f5850..be315fbe8efefc92324e43b235945ac9f2b173ae 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul2D.java +++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul2D.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.mdarray; +package com.aparapi.examples.mdarray; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class BMatMul2D extends Kernel{ byte[][] A; diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul3D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul3D.java index 244a8a904a87a789939d1b74cdb5bcb48f09a70e..7f7cf58b221496e0d9146a9008f3ecd7d8e5dd1e 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul3D.java +++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul3D.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.mdarray; +package com.aparapi.examples.mdarray; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class BMatMul3D extends Kernel{ byte[][][] A; diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul1D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul1D.java index 0752d2992905729481cf38cc1da9daf088b44aef..8a463d77173692ddf863ad506e55ba2cf6e3ff62 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul1D.java +++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul1D.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.mdarray; +package com.aparapi.examples.mdarray; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class DMatMul1D extends Kernel{ double[] A; diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul2D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul2D.java index de6c240f111eff89c8b5ce5c7da5e844ddc14802..a30c901e8144ad545ba082ce3156fb9e361b771d 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul2D.java +++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul2D.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.mdarray; +package com.aparapi.examples.mdarray; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class DMatMul2D extends Kernel{ double[][] A; diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul3D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul3D.java index f4b97f887a3df9af5a2b55dd820d2721dc499c4a..6c745a5a37ba0bebb78cb4b8be6270e63b3c1621 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul3D.java +++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul3D.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.mdarray; +package com.aparapi.examples.mdarray; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class DMatMul3D extends Kernel{ double[][][] A; diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul1D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul1D.java index 4596efb0d1bffb90ed5c039f9367b8f04336eba9..49562376e94149e4014ddb2adb091d756c6db695 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul1D.java +++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul1D.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.mdarray; +package com.aparapi.examples.mdarray; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class FMatMul1D extends Kernel{ float[] A; diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul2D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul2D.java index 1d4daf28893971265cb850751b8a4b98a1137034..eba56715c11ef7da2f60076e42b8f8bd37b13ba4 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul2D.java +++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul2D.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.mdarray; +package com.aparapi.examples.mdarray; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class FMatMul2D extends Kernel{ float[][] A; diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul3D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul3D.java index c1360b5347a4891b20b83471ac2e37e88c67b586..a4fd8a096b4c732b29a99bd41f7c58b0c4539367 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul3D.java +++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul3D.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.mdarray; +package com.aparapi.examples.mdarray; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class FMatMul3D extends Kernel{ float[][][] A; diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul1D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul1D.java index 0d7a57944f12c795144be3eda3afd9e90165d3c5..dbd7fe42493cdddd0283b0538fb333a5d4c01698 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul1D.java +++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul1D.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.mdarray; +package com.aparapi.examples.mdarray; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class IMatMul1D extends Kernel{ int[] A; diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul2D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul2D.java index 0f23dc8c5d0f0b4861dfc9a5ca2fca966e675ea4..69cf36faad09c060ec2284a795b5f1e4f08513fd 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul2D.java +++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul2D.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.mdarray; +package com.aparapi.examples.mdarray; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class IMatMul2D extends Kernel{ int[][] A; diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul3D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul3D.java index 71f83ef8a09293fad8a628b31d6a05d7233b9860..44017bcb3238eb52f310393593d6e2a6dd2af1b1 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul3D.java +++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul3D.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.mdarray; +package com.aparapi.examples.mdarray; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class IMatMul3D extends Kernel{ int[][][] A; diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul1D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul1D.java index b1e08cb959cc4e4a2cf2a5eb497a4146bbc95fce..7b013f93a001f313aec1eb60710cac8418c1f46e 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul1D.java +++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul1D.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.mdarray; +package com.aparapi.examples.mdarray; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class LMatMul1D extends Kernel{ long[] A; diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul2D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul2D.java index 65d16c4939c4ac5e9e552b076387b23220564513..c541c8e54ccbed0759d09d80ceb0edd98ae4fe39 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul2D.java +++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul2D.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.mdarray; +package com.aparapi.examples.mdarray; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class LMatMul2D extends Kernel{ long[][] A; diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul3D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul3D.java index 98c08419c3e426ce2448896626291db3a5cbd30f..b5460e8fc69f9f878d9f1f6f1573f4a8951283f8 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul3D.java +++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul3D.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.mdarray; +package com.aparapi.examples.mdarray; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class LMatMul3D extends Kernel{ long[][][] A; diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/MDArray.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/MDArray.java index 38819b1643d1a1bb569a3814a3af0028e415f08a..ff08012e71e9cc64f8c91fcd2640937f7cd7464f 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mdarray/MDArray.java +++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/MDArray.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.mdarray; +package com.aparapi.examples.mdarray; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class MDArray { diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul1D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul1D.java index 71e4ab4ba7863e4412964a68154e2c86929b91cb..9dfbf46733109b690df20b25a6b6d0de4d98d994 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul1D.java +++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul1D.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.mdarray; +package com.aparapi.examples.mdarray; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class SMatMul1D extends Kernel{ short[] A; diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul2D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul2D.java index 2d46af4f122134da9adcdcbc5a367cb482380f0e..c5e829c85c6a61166eb87ec0329fab97c9ca6726 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul2D.java +++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul2D.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.mdarray; +package com.aparapi.examples.mdarray; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class SMatMul2D extends Kernel{ short[][] A; diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul3D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul3D.java index 8558a669ffda715efd778f3965819e02e231dc7b..8828e5577f5dc016a8ffe4ca9a1ba91c0b2aac92 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul3D.java +++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul3D.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.mdarray; +package com.aparapi.examples.mdarray; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class SMatMul3D extends Kernel{ short[][][] A; diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul1D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul1D.java index f94092547b44b14084494710bed1f20ba0f02434..3f0dd51102086d48381c28462dce7afdf711f060 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul1D.java +++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul1D.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.mdarray; +package com.aparapi.examples.mdarray; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class ZMatMul1D extends Kernel{ boolean[] A; diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul2D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul2D.java index 0ddd5913abd735f2b698f5ebe81df4c916abc62d..b60a4fc92ba105bef9e10884071302ac9fabbb89 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul2D.java +++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul2D.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.mdarray; +package com.aparapi.examples.mdarray; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class ZMatMul2D extends Kernel{ boolean[][] A; diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul3D.java b/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul3D.java index d0a0940f2aa104f5b3fe0638230cc5654ccd5b05..5d3f27f15cb41f4f39b21f63bd6fff86faf714ae 100644 --- a/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul3D.java +++ b/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul3D.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.mdarray; +package com.aparapi.examples.mdarray; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class ZMatMul3D extends Kernel{ boolean[][][] A; diff --git a/src/main/java/com/syncleus/aparapi/examples/median/MedianDemo.java b/src/main/java/com/syncleus/aparapi/examples/median/MedianDemo.java index bbff9bbdfbc1007d0c67aa191481238db01de945..230815ac84bf8151e2829a4220ef0b62007884ad 100644 --- a/src/main/java/com/syncleus/aparapi/examples/median/MedianDemo.java +++ b/src/main/java/com/syncleus/aparapi/examples/median/MedianDemo.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.median; +package com.aparapi.examples.median; -import com.syncleus.aparapi.internal.kernel.*; +import com.aparapi.internal.kernel.*; import javax.imageio.*; import javax.swing.*; @@ -37,15 +37,15 @@ public class MedianDemo { public static void main(String[] ignored) { final int size = 5; - System.setProperty("com.syncleus.aparapi.dumpProfilesOnExit", "true"); + System.setProperty("com.aparapi.dumpProfilesOnExit", "true"); boolean verbose = false; if (verbose) { - System.setProperty("com.syncleus.aparapi.enableVerboseJNI", "true"); - System.setProperty("com.syncleus.aparapi.dumpFlags", "true"); - System.setProperty("com.syncleus.aparapi.enableShowGeneratedOpenCL", "true"); - System.setProperty("com.syncleus.aparapi.enableVerboseJNIOpenCLResourceTracking", "true"); - System.setProperty("com.syncleus.aparapi.enableExecutionModeReporting", "true"); + System.setProperty("com.aparapi.enableVerboseJNI", "true"); + System.setProperty("com.aparapi.dumpFlags", "true"); + System.setProperty("com.aparapi.enableShowGeneratedOpenCL", "true"); + System.setProperty("com.aparapi.enableVerboseJNIOpenCLResourceTracking", "true"); + System.setProperty("com.aparapi.enableExecutionModeReporting", "true"); } // KernelManager.setKernelManager(new KernelManager(){ diff --git a/src/main/java/com/syncleus/aparapi/examples/median/MedianKernel7x7.java b/src/main/java/com/syncleus/aparapi/examples/median/MedianKernel7x7.java index 349c2eecda207b2160d704c7b454dbf8af0ae24c..48903ca61cbb031841d8312723782d67e283a2f1 100644 --- a/src/main/java/com/syncleus/aparapi/examples/median/MedianKernel7x7.java +++ b/src/main/java/com/syncleus/aparapi/examples/median/MedianKernel7x7.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.median; +package com.aparapi.examples.median; -import com.syncleus.aparapi.*; +import com.aparapi.*; /** * Provides support for pixel windows of size no greater than 49 (e.g. 7x7). diff --git a/src/main/java/com/syncleus/aparapi/examples/median/MedianSettings.java b/src/main/java/com/syncleus/aparapi/examples/median/MedianSettings.java index 76068c4a40e716aa0c017a9ae3b4be7a67f9ff3f..948042de672b30228c4a24790b380d3fe1ee46aa 100644 --- a/src/main/java/com/syncleus/aparapi/examples/median/MedianSettings.java +++ b/src/main/java/com/syncleus/aparapi/examples/median/MedianSettings.java @@ -8,7 +8,7 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.median; +package com.aparapi.examples.median; public class MedianSettings { public final int windowWidth; diff --git a/src/main/java/com/syncleus/aparapi/examples/nbody/Local.java b/src/main/java/com/syncleus/aparapi/examples/nbody/Local.java index 9c76bd7def81463b27132947457db240281cc6d9..f5153d59d546006ba2412b54563da809fe66dc14 100644 --- a/src/main/java/com/syncleus/aparapi/examples/nbody/Local.java +++ b/src/main/java/com/syncleus/aparapi/examples/nbody/Local.java @@ -45,7 +45,7 @@ of EAR). For the most current Country Group listings, or for additional informa under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. */ -package com.syncleus.aparapi.examples.nbody; +package com.aparapi.examples.nbody; import java.awt.BorderLayout; import java.awt.Dimension; @@ -72,9 +72,9 @@ import javax.swing.JPanel; import javax.swing.JTextField; import javax.swing.WindowConstants; -import com.syncleus.aparapi.Kernel; -import com.syncleus.aparapi.ProfileInfo; -import com.syncleus.aparapi.Range; +import com.aparapi.Kernel; +import com.aparapi.ProfileInfo; +import com.aparapi.Range; import com.jogamp.opengl.util.FPSAnimator; import com.jogamp.opengl.util.texture.Texture; import com.jogamp.opengl.util.texture.TextureIO; @@ -84,7 +84,7 @@ import com.jogamp.opengl.util.texture.TextureIO; * * http://www.browndeertechnology.com/docs/BDT_OpenCL_Tutorial_NBody-rev3.html * - * @see com.syncleus.aparapi.examples.nbody.Main + * @see com.aparapi.examples.nbody.Main * * @author gfrost * diff --git a/src/main/java/com/syncleus/aparapi/examples/nbody/Main.java b/src/main/java/com/syncleus/aparapi/examples/nbody/Main.java index 5ca45361460f58a432c70183c03139ea4bdc3147..85e3f8f394894cd5d79d5e49d97d640b2d425b20 100644 --- a/src/main/java/com/syncleus/aparapi/examples/nbody/Main.java +++ b/src/main/java/com/syncleus/aparapi/examples/nbody/Main.java @@ -45,7 +45,7 @@ of EAR). For the most current Country Group listings, or for additional informa under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. */ -package com.syncleus.aparapi.examples.nbody; +package com.aparapi.examples.nbody; import java.awt.BorderLayout; import java.awt.Dimension; @@ -73,9 +73,9 @@ import javax.swing.JPanel; import javax.swing.JTextField; import javax.swing.WindowConstants; -import com.syncleus.aparapi.Kernel; -import com.syncleus.aparapi.ProfileInfo; -import com.syncleus.aparapi.Range; +import com.aparapi.Kernel; +import com.aparapi.ProfileInfo; +import com.aparapi.Range; import com.jogamp.opengl.util.FPSAnimator; import com.jogamp.opengl.util.texture.Texture; import com.jogamp.opengl.util.texture.TextureData; diff --git a/src/main/java/com/syncleus/aparapi/examples/nbody/Seq.java b/src/main/java/com/syncleus/aparapi/examples/nbody/Seq.java index b2cb25290e0fd00c579d78efe24a6c7e5b0410a6..b5e269e36c23f1427f01cef812849d89ad7f7e6b 100644 --- a/src/main/java/com/syncleus/aparapi/examples/nbody/Seq.java +++ b/src/main/java/com/syncleus/aparapi/examples/nbody/Seq.java @@ -45,7 +45,7 @@ of EAR). For the most current Country Group listings, or for additional informa under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. */ -package com.syncleus.aparapi.examples.nbody; +package com.aparapi.examples.nbody; import java.awt.BorderLayout; import java.awt.Dimension; @@ -73,9 +73,9 @@ import javax.swing.JPanel; import javax.swing.JTextField; import javax.swing.WindowConstants; -import com.syncleus.aparapi.Kernel; -import com.syncleus.aparapi.ProfileInfo; -import com.syncleus.aparapi.Range; +import com.aparapi.Kernel; +import com.aparapi.ProfileInfo; +import com.aparapi.Range; import com.jogamp.opengl.util.FPSAnimator; import com.jogamp.opengl.util.texture.Texture; import com.jogamp.opengl.util.texture.TextureData; diff --git a/src/main/java/com/syncleus/aparapi/examples/oopnbody/Body.java b/src/main/java/com/syncleus/aparapi/examples/oopnbody/Body.java index 36bf2e3108d890f594b8a0343d8223c2e896e5d0..2f2fb9a4c60b646ed68d1f43ce6f87450b808e91 100644 --- a/src/main/java/com/syncleus/aparapi/examples/oopnbody/Body.java +++ b/src/main/java/com/syncleus/aparapi/examples/oopnbody/Body.java @@ -8,7 +8,7 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.oopnbody; +package com.aparapi.examples.oopnbody; import java.util.List; diff --git a/src/main/java/com/syncleus/aparapi/examples/oopnbody/Main.java b/src/main/java/com/syncleus/aparapi/examples/oopnbody/Main.java index 7c6b8d486194b04f3b0d089cf6617475aecdf920..2b6d40469123e3c4bb024f965ec08505970a1c14 100644 --- a/src/main/java/com/syncleus/aparapi/examples/oopnbody/Main.java +++ b/src/main/java/com/syncleus/aparapi/examples/oopnbody/Main.java @@ -45,7 +45,7 @@ of EAR). For the most current Country Group listings, or for additional informa under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. */ -package com.syncleus.aparapi.examples.oopnbody; +package com.aparapi.examples.oopnbody; import java.awt.BorderLayout; import java.awt.Dimension; @@ -75,9 +75,9 @@ import javax.swing.JPanel; import javax.swing.JTextField; import javax.swing.WindowConstants; -import com.syncleus.aparapi.Kernel; -import com.syncleus.aparapi.ProfileInfo; -import com.syncleus.aparapi.Range; +import com.aparapi.Kernel; +import com.aparapi.ProfileInfo; +import com.aparapi.Range; import com.jogamp.opengl.util.FPSAnimator; import com.jogamp.opengl.util.texture.Texture; diff --git a/src/main/java/com/syncleus/aparapi/examples/progress/LongRunningKernel.java b/src/main/java/com/syncleus/aparapi/examples/progress/LongRunningKernel.java index e3799f01c17c6c2309fc74b754d2186a93ff97aa..a510b643378ae3d9f2a81d5c959e39b8b4dd03e7 100644 --- a/src/main/java/com/syncleus/aparapi/examples/progress/LongRunningKernel.java +++ b/src/main/java/com/syncleus/aparapi/examples/progress/LongRunningKernel.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.progress; +package com.aparapi.examples.progress; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; /** * Kernel which performs very many meaningless calculations, used to demonstrate progress tracking and cancellation of multi-pass Kernels. diff --git a/src/main/java/com/syncleus/aparapi/examples/progress/MultiPassKernelSwingWorkerDemo.java b/src/main/java/com/syncleus/aparapi/examples/progress/MultiPassKernelSwingWorkerDemo.java index 0cf5ef16fca25074801b8edfc507ef7ee626ca26..87bac2183acf84b578ae2580e39e6cecd67ab916 100644 --- a/src/main/java/com/syncleus/aparapi/examples/progress/MultiPassKernelSwingWorkerDemo.java +++ b/src/main/java/com/syncleus/aparapi/examples/progress/MultiPassKernelSwingWorkerDemo.java @@ -8,11 +8,11 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.progress; +package com.aparapi.examples.progress; -import com.syncleus.aparapi.*; -import com.syncleus.aparapi.internal.kernel.*; -import com.syncleus.aparapi.util.swing.MultiPassKernelSwingWorker; +import com.aparapi.*; +import com.aparapi.internal.kernel.*; +import com.aparapi.util.swing.MultiPassKernelSwingWorker; import javax.swing.*; import javax.swing.plaf.nimbus.NimbusLookAndFeel; diff --git a/src/main/java/com/syncleus/aparapi/examples/progress/ProgressAndCancelDemo.java b/src/main/java/com/syncleus/aparapi/examples/progress/ProgressAndCancelDemo.java index c09c510e146cb6a2df975e3aa8d3547eed16edaf..6dcd759ac5fd245d547ff2452362b517c780f929 100644 --- a/src/main/java/com/syncleus/aparapi/examples/progress/ProgressAndCancelDemo.java +++ b/src/main/java/com/syncleus/aparapi/examples/progress/ProgressAndCancelDemo.java @@ -8,9 +8,9 @@ * For additional credits (generally to people who reported problems) * see CREDITS file. */ -package com.syncleus.aparapi.examples.progress; +package com.aparapi.examples.progress; -import com.syncleus.aparapi.internal.kernel.*; +import com.aparapi.internal.kernel.*; import javax.swing.*; import javax.swing.plaf.nimbus.*; @@ -36,11 +36,11 @@ public class ProgressAndCancelDemo { public static void main(String[] ignored) throws Exception { - System.setProperty("com.syncleus.aparapi.enableShowGeneratedOpenCL", "true"); - System.setProperty("com.syncleus.aparapi.enableVerboseJNI", "true"); - System.setProperty("com.syncleus.aparapi.dumpFlags", "true"); - System.setProperty("com.syncleus.aparapi.enableVerboseJNIOpenCLResourceTracking", "true"); - System.setProperty("com.syncleus.aparapi.enableExecutionModeReporting", "true"); + System.setProperty("com.aparapi.enableShowGeneratedOpenCL", "true"); + System.setProperty("com.aparapi.enableVerboseJNI", "true"); + System.setProperty("com.aparapi.dumpFlags", "true"); + System.setProperty("com.aparapi.enableVerboseJNIOpenCLResourceTracking", "true"); + System.setProperty("com.aparapi.enableExecutionModeReporting", "true"); kernel = new LongRunningKernel(); if (TEST_JTP) { diff --git a/src/main/java/com/syncleus/aparapi/examples/squares/Main.java b/src/main/java/com/syncleus/aparapi/examples/squares/Main.java index 7b8bc2380418004d71ef0ad4b15ba7499ac7e34d..e7f3bf8e78381a0b828e24ad9431a2fa4d7de570 100644 --- a/src/main/java/com/syncleus/aparapi/examples/squares/Main.java +++ b/src/main/java/com/syncleus/aparapi/examples/squares/Main.java @@ -46,10 +46,10 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit */ -package com.syncleus.aparapi.examples.squares; +package com.aparapi.examples.squares; -import com.syncleus.aparapi.Kernel; -import com.syncleus.aparapi.Range; +import com.aparapi.Kernel; +import com.aparapi.Range; /** * An example Aparapi application which computes and displays squares of a set of 512 input values. diff --git a/test/codegen/build.xml b/test/codegen/build.xml index 88d41a881f64df30d1756b828df81230c0e42a42..350f54b04f3e57190b64ff3458d4fccd15629745 100644 --- a/test/codegen/build.xml +++ b/test/codegen/build.xml @@ -44,7 +44,7 @@ </target> <path id="classpath"> - <pathelement path="${basedir}/../../com.syncleus.aparapi/dist/aparapi.jar" /> + <pathelement path="${basedir}/../../com.aparapi/dist/aparapi.jar" /> <pathelement path="${junit.home}/${junit.jar.name}" /> <pathelement path="classes" /> </path> @@ -56,7 +56,7 @@ <compilerarg value="-Xlint:-path" /> </javac> - <java classname="com.syncleus.aparapi.CreateJUnitTests" classpathref="classpath"> + <java classname="com.aparapi.CreateJUnitTests" classpathref="classpath"> <sysproperty key="root" value="${basedir}" /> </java> diff --git a/test/codegen/src/java/com/amd/aparapi/CodeGenJUnitBase.java b/test/codegen/src/java/com/amd/aparapi/CodeGenJUnitBase.java index 6e02f730aff85def091b55ec9a8ee4556ad711e5..746b6da74b495c2c8b8360114845726709d12c21 100644 --- a/test/codegen/src/java/com/amd/aparapi/CodeGenJUnitBase.java +++ b/test/codegen/src/java/com/amd/aparapi/CodeGenJUnitBase.java @@ -35,17 +35,17 @@ of EAR). For the most current Country Group listings, or for additional informa under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. */ -package com.syncleus.aparapi; +package com.aparapi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.Arrays; -import com.syncleus.aparapi.internal.exception.AparapiException; -import com.syncleus.aparapi.internal.model.ClassModel; -import com.syncleus.aparapi.internal.model.Entrypoint; -import com.syncleus.aparapi.internal.writer.KernelWriter; +import com.aparapi.internal.exception.AparapiException; +import com.aparapi.internal.model.ClassModel; +import com.aparapi.internal.model.Entrypoint; +import com.aparapi.internal.writer.KernelWriter; public class CodeGenJUnitBase { diff --git a/test/codegen/src/java/com/amd/aparapi/CreateJUnitTests.java b/test/codegen/src/java/com/amd/aparapi/CreateJUnitTests.java index 874b0cf87ac2781d98c52f4eed2155d21c8433d9..e75c22c9e3427fa5a2244a697c416b2329ba610c 100644 --- a/test/codegen/src/java/com/amd/aparapi/CreateJUnitTests.java +++ b/test/codegen/src/java/com/amd/aparapi/CreateJUnitTests.java @@ -35,7 +35,7 @@ of EAR). For the most current Country Group listings, or for additional informa under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. */ -package com.syncleus.aparapi; +package com.aparapi; import java.io.File; import java.io.FileNotFoundException; @@ -78,7 +78,7 @@ public class CreateJUnitTests { Source source = new Source(Class.forName(testPackageName + "." + className), sourceDir); StringBuilder sb = new StringBuilder(); - sb.append("package com.syncleus.aparapi.test.junit.codegen;\n"); + sb.append("package com.aparapi.test.junit.codegen;\n"); sb.append("import org.junit.Test;\n"); String doc = source.getDocString(); if (doc.length() > 0) { @@ -86,7 +86,7 @@ public class CreateJUnitTests { sb.append(doc); sb.append("\n */\n"); } - sb.append("public class " + className + " extends com.syncleus.aparapi.CodeGenJUnitBase{\n"); + sb.append("public class " + className + " extends com.aparapi.CodeGenJUnitBase{\n"); appendExpectedOpenCL(source, sb); appendExpectedExceptions(source, sb); appendTest(testPackageName, className, "", sb); @@ -112,12 +112,12 @@ public class CreateJUnitTests { private static void appendExpectedExceptions(Source source, StringBuilder sb) { String exceptions = source.getExceptionsString(); if (exceptions.length() > 0) { - sb.append(" private static final Class<? extends com.syncleus.aparapi.internal.exception.AparapiException> expectedException = "); + sb.append(" private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = "); - sb.append("com.syncleus.aparapi.internal.exception." + exceptions + ".class"); + sb.append("com.aparapi.internal.exception." + exceptions + ".class"); sb.append(";\n"); } else { - sb.append(" private static final Class<? extends com.syncleus.aparapi.internal.exception.AparapiException> expectedException = null;\n"); + sb.append(" private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = null;\n"); } } diff --git a/test/codegen/src/java/com/amd/aparapi/Diff.java b/test/codegen/src/java/com/amd/aparapi/Diff.java index 60b1624668cdd365eb5097401323561807c7d3c1..97d80166140c52ca7c4107f270ae22305b4c7d93 100644 --- a/test/codegen/src/java/com/amd/aparapi/Diff.java +++ b/test/codegen/src/java/com/amd/aparapi/Diff.java @@ -35,7 +35,7 @@ of EAR). For the most current Country Group listings, or for additional informa under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. */ -package com.syncleus.aparapi; +package com.aparapi; import java.awt.Point; import java.util.ArrayList; diff --git a/test/codegen/src/java/com/amd/aparapi/KernelHelper.java b/test/codegen/src/java/com/amd/aparapi/KernelHelper.java index 8ee40096ac82b2512c3813a809471ff744f766c6..e12b78e7cad6081aaec17ef6713552e0da65816b 100644 --- a/test/codegen/src/java/com/amd/aparapi/KernelHelper.java +++ b/test/codegen/src/java/com/amd/aparapi/KernelHelper.java @@ -35,10 +35,10 @@ of EAR). For the most current Country Group listings, or for additional informa under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. */ -package com.syncleus.aparapi; +package com.aparapi; // contains some things that only tests would use -// but in the com.syncleus.aparapi package for convenience +// but in the com.aparapi package for convenience public class KernelHelper{ // public KernelHelper(Kernel kernel) { diff --git a/test/codegen/src/java/com/amd/aparapi/Source.java b/test/codegen/src/java/com/amd/aparapi/Source.java index 379c5eab81799d070ba78db8fbddd3734c140589..0c8a74a532af090862230b66f83e627a723d18d3 100644 --- a/test/codegen/src/java/com/amd/aparapi/Source.java +++ b/test/codegen/src/java/com/amd/aparapi/Source.java @@ -35,7 +35,7 @@ of EAR). For the most current Country Group listings, or for additional informa under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. */ -package com.syncleus.aparapi; +package com.aparapi; import java.io.BufferedReader; import java.io.File; diff --git a/test/codegen/src/java/com/amd/aparapi/SwingDiff.java b/test/codegen/src/java/com/amd/aparapi/SwingDiff.java index dbc16ad05a562af0ef17d0d76a12a7abc6a3168f..25f069b95bae0951b241897792c25f582a84f9e5 100644 --- a/test/codegen/src/java/com/amd/aparapi/SwingDiff.java +++ b/test/codegen/src/java/com/amd/aparapi/SwingDiff.java @@ -35,7 +35,7 @@ of EAR). For the most current Country Group listings, or for additional informa under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. */ -package com.syncleus.aparapi; +package com.aparapi; import java.awt.BorderLayout; import java.awt.Color; @@ -61,7 +61,7 @@ import javax.swing.text.Style; import javax.swing.text.StyleConstants; import javax.swing.text.StyleContext; -import com.syncleus.aparapi.Diff.DiffResult; +import com.aparapi.Diff.DiffResult; public class SwingDiff{ JFrame frame; diff --git a/test/codegen/src/java/com/amd/aparapi/test/Access2DIntArray.java b/test/codegen/src/java/com/amd/aparapi/test/Access2DIntArray.java index 4b7e219934a61be78f2281e492a73c596c2c14bd..1620ae4580bf5bddcacfbb4e0c807ca9194bc514 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/Access2DIntArray.java +++ b/test/codegen/src/java/com/amd/aparapi/test/Access2DIntArray.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class Access2DIntArray{ int[][] ints = new int[1024][]; diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessBooleanArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessBooleanArray.java index 1032e15d24bf775d44f96c05396551f6d0e0025a..64092be0d2ef401480491336b0e17ecfad59635d 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/AccessBooleanArray.java +++ b/test/codegen/src/java/com/amd/aparapi/test/AccessBooleanArray.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class AccessBooleanArray{ boolean[] ba = new boolean[1024]; diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessByteArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessByteArray.java index f29fa8e2b1f8ec3792d39cb2563dab9228d3081d..8f843e169a518f962c8cfc350374907ddb07d7a7 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/AccessByteArray.java +++ b/test/codegen/src/java/com/amd/aparapi/test/AccessByteArray.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; /** * diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessDoubleArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessDoubleArray.java index 2298fb216dd71372509ecc144fae97227a504d8e..609ac21358661358dfcebade6be70d371436579e 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/AccessDoubleArray.java +++ b/test/codegen/src/java/com/amd/aparapi/test/AccessDoubleArray.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class AccessDoubleArray{ double[] doubles = new double[1024]; diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessFloatArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessFloatArray.java index 5b7eb1736e7b952f75574300b4c39778f541a57c..95242fcd25fc22eb639d2242a5ee70be6d1e1d48 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/AccessFloatArray.java +++ b/test/codegen/src/java/com/amd/aparapi/test/AccessFloatArray.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class AccessFloatArray{ float[] floats = new float[1024]; diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessIntArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessIntArray.java index 699854101a83caa6aaeee38e490428ddde23dbc6..27d2e66434d5e8056b8b49cb38f5ac71fa10d0fb 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/AccessIntArray.java +++ b/test/codegen/src/java/com/amd/aparapi/test/AccessIntArray.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class AccessIntArray{ int[] ints = new int[1024]; diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessLongArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessLongArray.java index 1adbcb2ad3a86db13a04f5340c202abf05cd9328..3c4941e423ef32127ba2bc6e470776d3552b82c7 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/AccessLongArray.java +++ b/test/codegen/src/java/com/amd/aparapi/test/AccessLongArray.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class AccessLongArray{ long[] longs = new long[1024]; diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessNested2DIntArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessNested2DIntArray.java index 39a985af6896d24b88e1d66a9ff8be4a4b1d5ac3..79b70e18a9c195bd8826b859e5fde43157458eb5 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/AccessNested2DIntArray.java +++ b/test/codegen/src/java/com/amd/aparapi/test/AccessNested2DIntArray.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class AccessNested2DIntArray{ int[] indices = new int[1024]; diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessShortArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessShortArray.java index 407cfa08a8100428ca2a13bb302bd10cd3b9764d..5c11192ad59ef3002a1c983b967aa738295c2b86 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/AccessShortArray.java +++ b/test/codegen/src/java/com/amd/aparapi/test/AccessShortArray.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class AccessShortArray{ short[] shorts = new short[1024]; diff --git a/test/codegen/src/java/com/amd/aparapi/test/AndOrAndPrecedence.java b/test/codegen/src/java/com/amd/aparapi/test/AndOrAndPrecedence.java index d6cfe000d530e617e46df8cd48efddcc722177b2..237dff87a2b7a4b51ee34632d8b0cdda12b6e82f 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/AndOrAndPrecedence.java +++ b/test/codegen/src/java/com/amd/aparapi/test/AndOrAndPrecedence.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class AndOrAndPrecedence{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence.java b/test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence.java index b82ff1e1d45d6279a36a1f55fbaa4e953084ceef..037b5c418269cc091010ac153df56ef32fde964d 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence.java +++ b/test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class AndOrPrecedence{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence2.java b/test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence2.java index 4a0236120c66c668f58ea9d6ff308e1ae8885484..4818974fae0b9663ca5c4b2852222c31eb243ebb 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence2.java +++ b/test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence2.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class AndOrPrecedence2{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope.java b/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope.java index 99b800c8255679bee54d65b30263ab7be0b47791..ab0e684c6f53bc6a7c250f92df4b232d6dcea4a4 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ArbitraryScope{ int width = 1024; diff --git a/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope2.java b/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope2.java index 458f7f2300426941c24a8a6202c1509c605a49a8..78d9fa409eed3eb3b2bcc6fc4d28f199daf7092c 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope2.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope2.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ArbitraryScope2{ int width = 1024; diff --git a/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScopeSimple.java b/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScopeSimple.java index 33d93d491561b2620359990f30a3a42d41e93ef9..9a411251cfdf2f632789a4d407dd913e5dbd7c4a 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScopeSimple.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScopeSimple.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ArbitraryScopeSimple{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ArrayTortureIssue35.java b/test/codegen/src/java/com/amd/aparapi/test/ArrayTortureIssue35.java index efa395c24a94bf0d492322e719237dd5cfd75328..3eadf9dfdb11b38cd03ef54764570b68e91f5596 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ArrayTortureIssue35.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ArrayTortureIssue35.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ArrayTortureIssue35{ int[] a = new int[1]; diff --git a/test/codegen/src/java/com/amd/aparapi/test/Assign2DIntArray.java b/test/codegen/src/java/com/amd/aparapi/test/Assign2DIntArray.java index 2d181751f8c1d2d511443e9aa459025c61714c4a..e284483f66439e9675bdcede43d2294a089d4513 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/Assign2DIntArray.java +++ b/test/codegen/src/java/com/amd/aparapi/test/Assign2DIntArray.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class Assign2DIntArray{ int[][] ints = new int[1024][]; diff --git a/test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameter.java b/test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameter.java index 94aa6e1e22c36af86a9bc37178442328337a1b88..7ba26604880b7196be3a8480870320da6bf273a7 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameter.java +++ b/test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameter.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class AssignAndPassAsParameter{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameterSimple.java b/test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameterSimple.java index 9c661c1bf07e00a12786808485d139f9285dde9c..c7cfc093d18781b462c05195b164799f35a1ba7d 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameterSimple.java +++ b/test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameterSimple.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class AssignAndPassAsParameterSimple{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/AssignField.java b/test/codegen/src/java/com/amd/aparapi/test/AssignField.java index 445b174e547efc844453def1850b254d4e813ed6..015bb21e6ff4a4b3d516edcb6cae06a5356b4e7c 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/AssignField.java +++ b/test/codegen/src/java/com/amd/aparapi/test/AssignField.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class AssignField{ int field = 1024; diff --git a/test/codegen/src/java/com/amd/aparapi/test/Atomic32Pragma.java b/test/codegen/src/java/com/amd/aparapi/test/Atomic32Pragma.java index c46ad1b96a6b16b9e9a21ea78ce08cc13a31dd4b..e8961c33ce1ca9918bbd8176925fc2ec0b4d62e9 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/Atomic32Pragma.java +++ b/test/codegen/src/java/com/amd/aparapi/test/Atomic32Pragma.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class Atomic32Pragma extends Kernel{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/BooleanToggle.java b/test/codegen/src/java/com/amd/aparapi/test/BooleanToggle.java index 586b39310bbafa46320bd54e5f1dfa33ca2aebf5..433bc7366bb6d6cbc90c57d69f11564947158b70 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/BooleanToggle.java +++ b/test/codegen/src/java/com/amd/aparapi/test/BooleanToggle.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class BooleanToggle{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/Break.java b/test/codegen/src/java/com/amd/aparapi/test/Break.java index 0e247b49a5a5ecd76f230faeadd290e57f3db43b..9f1d89211abda32e4c0c18b4d86070d42b2d6ea8 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/Break.java +++ b/test/codegen/src/java/com/amd/aparapi/test/Break.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class Break{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/ByteParams.java b/test/codegen/src/java/com/amd/aparapi/test/ByteParams.java index dd9eb4d97306046510463ea5a7e6ca7deb76b48c..d74806660f9ada2898de6570ababd18b37f6023b 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ByteParams.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ByteParams.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ByteParams{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ByteParamsSimple.java b/test/codegen/src/java/com/amd/aparapi/test/ByteParamsSimple.java index c840e320c063f4a0882af1e1920da72cf24438a9..ecff6f21e550c4763cd7715338efe77a1b936eda 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ByteParamsSimple.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ByteParamsSimple.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ByteParamsSimple{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallGetPassId.java b/test/codegen/src/java/com/amd/aparapi/test/CallGetPassId.java index 78a26bc682695832e426156ca79595f5d92d7ed6..d78406bc98d6a37761e5a6d697dbc10f5167b833 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/CallGetPassId.java +++ b/test/codegen/src/java/com/amd/aparapi/test/CallGetPassId.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class CallGetPassId extends Kernel{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallObject.java b/test/codegen/src/java/com/amd/aparapi/test/CallObject.java index 4108e2699f70afc268e2dd0a4f2b19ab6b90124b..563ab66c05d66b33bbc76b173d486b5dde2e0ab9 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/CallObject.java +++ b/test/codegen/src/java/com/amd/aparapi/test/CallObject.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class CallObject extends Kernel{ static class Dummy{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallObjectStatic.java b/test/codegen/src/java/com/amd/aparapi/test/CallObjectStatic.java index 6074f7ea2a829a8ba2c359695e5f5dbc33d4ef51..44dbac58419bb337eb59858157b669b78d0b69f4 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/CallObjectStatic.java +++ b/test/codegen/src/java/com/amd/aparapi/test/CallObjectStatic.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class CallObjectStatic extends Kernel{ static class Dummy{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallRunSuper.java b/test/codegen/src/java/com/amd/aparapi/test/CallRunSuper.java index 5ca25a03bccd0d8236ec10c94571d42f2dffb4c9..5e1da01d78964651378ca7a0823f8f1f77fae8eb 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/CallRunSuper.java +++ b/test/codegen/src/java/com/amd/aparapi/test/CallRunSuper.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class CallRunSuperBase extends Kernel{ @Override public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallStaticInAnotherClass.java b/test/codegen/src/java/com/amd/aparapi/test/CallStaticInAnotherClass.java index 038dbe8c2e5305df41627398e2b807bbf374cfcd..d4763de9345cf92223faae817b48bb59ffc97be6 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/CallStaticInAnotherClass.java +++ b/test/codegen/src/java/com/amd/aparapi/test/CallStaticInAnotherClass.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class AnotherClass{ static public int foo() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallSuper.java b/test/codegen/src/java/com/amd/aparapi/test/CallSuper.java index ee2fd2ada256ff7f3c0e939c45f12439535513ba..f744311c74057e32e3779e2342156fb6702914b7 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/CallSuper.java +++ b/test/codegen/src/java/com/amd/aparapi/test/CallSuper.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; abstract class CallSuperBase extends Kernel{ int foo(int n) { diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallTwice.java b/test/codegen/src/java/com/amd/aparapi/test/CallTwice.java index f08cc733f3c434ba7062fc9e093e4ac732cb5b3a..5f1f759bd842389a1e1e2bc50f07806b70af8c53 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/CallTwice.java +++ b/test/codegen/src/java/com/amd/aparapi/test/CallTwice.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class CallTwice extends Kernel{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/CharArrayField.java b/test/codegen/src/java/com/amd/aparapi/test/CharArrayField.java index 971cd0fa2861ce6570b53d417a15c2e82b473501..2accdc8062892cefeee2a691a95f8abadf4db2e3 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/CharArrayField.java +++ b/test/codegen/src/java/com/amd/aparapi/test/CharArrayField.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class CharArrayField{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/CharAsParameter.java b/test/codegen/src/java/com/amd/aparapi/test/CharAsParameter.java index a16c905c450db175e7d60873ec0875aeeaaf7e3f..1f9941331fe6885f91a27422630f5820b57143d6 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/CharAsParameter.java +++ b/test/codegen/src/java/com/amd/aparapi/test/CharAsParameter.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class CharAsParameter{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/CharType.java b/test/codegen/src/java/com/amd/aparapi/test/CharType.java index fbe9eed6af33d0d7f70db478bbe7c93ae68ae7d1..c4b6004e12b6c53fc2ccc3c33805c6e0362ecb74 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/CharType.java +++ b/test/codegen/src/java/com/amd/aparapi/test/CharType.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class CharType extends Kernel{ @Override public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticFieldAccess.java b/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticFieldAccess.java index 715cc0c25db85b2eaec553cbbf5a9a44474ac8fb..1b2d2034e07583aae496cf2b54d56cf93509f307 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticFieldAccess.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticFieldAccess.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ClassHasStaticFieldAccess{ int[] ints = new int[1024]; diff --git a/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethod.java b/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethod.java index 9c86797c7e7f974f98854b76719e958648863748..eac1c18fc7868e35bbe3a24306137b48f203517f 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethod.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethod.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ClassHasStaticMethod{ int[] ints = new int[1024]; diff --git a/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethodSimple.java b/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethodSimple.java index 27393870db83b08c103772980d9538c5dd5ea9be..f66fec5aa6af162f1fac793e667c2b0407b77a95 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethodSimple.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethodSimple.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ClassHasStaticMethodSimple{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/CompositeArbitraryScope.java b/test/codegen/src/java/com/amd/aparapi/test/CompositeArbitraryScope.java index 3047f29458174c53b413865f93d02656ce3d8f2d..fa09371a13eb8b1d1b104c64d29e7873063867a7 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/CompositeArbitraryScope.java +++ b/test/codegen/src/java/com/amd/aparapi/test/CompositeArbitraryScope.java @@ -1,9 +1,9 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; // this example gave the following error: -/// com.syncleus.aparapi.classtools.writer.CodeGenException: composite COMPOSITE_ARBITRARY_SCOPE +/// com.aparapi.classtools.writer.CodeGenException: composite COMPOSITE_ARBITRARY_SCOPE -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class CompositeArbitraryScope extends Kernel{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ConstantAssignInExpression.java b/test/codegen/src/java/com/amd/aparapi/test/ConstantAssignInExpression.java index b155a01f39a77f5a902ec10adf7cfe9399bbe5ec..51fcfe8ff1a873394f40a296cab0bb4a5589a452 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ConstantAssignInExpression.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ConstantAssignInExpression.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ConstantAssignInExpression{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/Continue.java b/test/codegen/src/java/com/amd/aparapi/test/Continue.java index e997360a5cebc2fb3785a58f80e91b2815b014c3..81412370bc821fe1e2e3579fbaea607da45691e9 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/Continue.java +++ b/test/codegen/src/java/com/amd/aparapi/test/Continue.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class Continue{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/ContinueTorture.java b/test/codegen/src/java/com/amd/aparapi/test/ContinueTorture.java index adbe38e4a2efb7c796a661b17e4e23a2df10624d..d562bce62fa5fce2bb067669ddf4cf70d2bf8162 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ContinueTorture.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ContinueTorture.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ContinueTorture{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/DirectRecursion.java b/test/codegen/src/java/com/amd/aparapi/test/DirectRecursion.java index a0014dd1cb8c6e87b228d352c9e7ba0a21d5bc3c..c89589aa0f228fa51807270eb062de821ce2f958 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/DirectRecursion.java +++ b/test/codegen/src/java/com/amd/aparapi/test/DirectRecursion.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class DirectRecursion extends Kernel{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/DoWhile.java b/test/codegen/src/java/com/amd/aparapi/test/DoWhile.java index 8c54fb1d42e6cf88888cbe0d1ca0dc51c94277b6..b4421b9171ef5880100f9e43f81ae3f0b608758c 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/DoWhile.java +++ b/test/codegen/src/java/com/amd/aparapi/test/DoWhile.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class DoWhile{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/Drem.java b/test/codegen/src/java/com/amd/aparapi/test/Drem.java index 21318280a268038d556bdd172f80107ee83ea298..dc71c046374702328cb5d4d04a419f462cdef5d4 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/Drem.java +++ b/test/codegen/src/java/com/amd/aparapi/test/Drem.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class Drem{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/EarlyReturn.java b/test/codegen/src/java/com/amd/aparapi/test/EarlyReturn.java index aeb37123d3a439ee580f0811101ddcc6117ca372..ba4e1dc01639205d93c6a1271cd3f31bbbdaecc7 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/EarlyReturn.java +++ b/test/codegen/src/java/com/amd/aparapi/test/EarlyReturn.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class EarlyReturn{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/EmptyWhileWithInc.java b/test/codegen/src/java/com/amd/aparapi/test/EmptyWhileWithInc.java index 458f8a6f3eac73f6cff1f817432b6abdd16babe0..22e6819f4e039fbaf0ac3e198abe0b6cbecb6352 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/EmptyWhileWithInc.java +++ b/test/codegen/src/java/com/amd/aparapi/test/EmptyWhileWithInc.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class EmptyWhileWithInc{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/EntrypointRecursion.java b/test/codegen/src/java/com/amd/aparapi/test/EntrypointRecursion.java index dee44b579d40ad582daa0ddbe39e69b181a6ee63..e506463ca7415b3d7fa9cd7a58986dc31b9e5016 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/EntrypointRecursion.java +++ b/test/codegen/src/java/com/amd/aparapi/test/EntrypointRecursion.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class EntrypointRecursion extends Kernel{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/Ex.java b/test/codegen/src/java/com/amd/aparapi/test/Ex.java index 0da21bc5d3d895538ff4b31c9a82640ce1a0adc3..f40dad41a3e6d0339bf809f1f2b421a26a3f5812 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/Ex.java +++ b/test/codegen/src/java/com/amd/aparapi/test/Ex.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class Ex{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression.java b/test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression.java index 78a26726362a9da890a6747d80b080b400c8ef0c..1f40cb4c3f2f2be467bbf8d07cd4748cea5ffc3d 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression.java +++ b/test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class FirstAssignInExpression{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression2.java b/test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression2.java index 0c03c848a59c97b26999da8192440dd7473024e6..ce3ed6cc56cd629af905f6bf291071064503cd74 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression2.java +++ b/test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression2.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class FirstAssignInExpression2{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/FloatParams.java b/test/codegen/src/java/com/amd/aparapi/test/FloatParams.java index 2f02a3344595f469db0135c047470b0150f20aea..308ea0501637c761ae97d6fd86b38657c0b6b117 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/FloatParams.java +++ b/test/codegen/src/java/com/amd/aparapi/test/FloatParams.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class FloatParams{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/FloatParamsSimple.java b/test/codegen/src/java/com/amd/aparapi/test/FloatParamsSimple.java index 561272f40c138569dab1ec10d7bb1b33cae0f3a2..c032eae029d42b906738e882e010713ae6457f40 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/FloatParamsSimple.java +++ b/test/codegen/src/java/com/amd/aparapi/test/FloatParamsSimple.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class FloatParamsSimple{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/For.java b/test/codegen/src/java/com/amd/aparapi/test/For.java index cfb31e332bc2e306c5bed6d8726cc39136e60f39..5a5d0002b11257de24d51aced1bfec85afb299db 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/For.java +++ b/test/codegen/src/java/com/amd/aparapi/test/For.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class For{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForAnd.java b/test/codegen/src/java/com/amd/aparapi/test/ForAnd.java index 44278b1a60474f2cb0b4e1efc8ca7b90c802a6dc..dc1d306769be29bbbfb900a2bb39b494642245aa 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ForAnd.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ForAnd.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ForAnd{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForAndMandel.java b/test/codegen/src/java/com/amd/aparapi/test/ForAndMandel.java index 3f7c3254d7b2d4bc8b718ba01ec8d13d7e20d8d9..c845107259649c1d680443a4a6367d3ee801c90d 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ForAndMandel.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ForAndMandel.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ForAndMandel{ int width = 1024; diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForAndMandelNoInitialize.java b/test/codegen/src/java/com/amd/aparapi/test/ForAndMandelNoInitialize.java index d4b63f9e946139275540019b57c81cae31216be1..179bf51d3f035407361e40291d1a6195deedf6d6 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ForAndMandelNoInitialize.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ForAndMandelNoInitialize.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ForAndMandelNoInitialize{ int width = 1024; diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForAsFirst.java b/test/codegen/src/java/com/amd/aparapi/test/ForAsFirst.java index ec13ed5e0c9795c3847f172ba51c318d8f35c26e..1e0dd6e4d0b06854183bf9a887eec4981e44a22f 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ForAsFirst.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ForAsFirst.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ForAsFirst{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForBooleanToggle.java b/test/codegen/src/java/com/amd/aparapi/test/ForBooleanToggle.java index 18620ad9a76e92f60548ba035f5ff00e6da599de..14be5b3ad69de71ad5c0b861d9f583cd99eb518d 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ForBooleanToggle.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ForBooleanToggle.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ForBooleanToggle{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForBreak.java b/test/codegen/src/java/com/amd/aparapi/test/ForBreak.java index 0f729f238e1001af68abf8f9d5cc7ab4fb0e7854..d89d71a214fdcc358bee191ef91dfa3f4f605775 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ForBreak.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ForBreak.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ForBreak{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForEach.java b/test/codegen/src/java/com/amd/aparapi/test/ForEach.java index aac4887e3de39ff6009c17066b903d0ef747794f..a84a78bca4e69820f077ded30666a9a972dfa80b 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ForEach.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ForEach.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ForEach{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForIf.java b/test/codegen/src/java/com/amd/aparapi/test/ForIf.java index 41d417112550dd828ec2466d674e64f779cb32b4..75f41172a5506a5b3d5bd19e21616621a6434adb 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ForIf.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ForIf.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ForIf{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForIfMandel.java b/test/codegen/src/java/com/amd/aparapi/test/ForIfMandel.java index f31e132b60d3b667654f8094105176af64172139..894bca83856df398f5da9ae0bd420530ca06af62 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ForIfMandel.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ForIfMandel.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ForIfMandel{ int width = 1024; diff --git a/test/codegen/src/java/com/amd/aparapi/test/Frem.java b/test/codegen/src/java/com/amd/aparapi/test/Frem.java index d2a7c0de5e2677169d942de1a44a99734e4421c3..c7a03284895e31d18ca53c276d54033980a73e9b 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/Frem.java +++ b/test/codegen/src/java/com/amd/aparapi/test/Frem.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class Frem{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IEEERemainderDouble.java b/test/codegen/src/java/com/amd/aparapi/test/IEEERemainderDouble.java index e5fd68aa0e362484d1e1a2d634c753113984fd07..e410f0d2379ef830b8c34f375b4c33d70a07d1b8 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IEEERemainderDouble.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IEEERemainderDouble.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class IEEERemainderDouble extends Kernel{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IEEERemainderFloat.java b/test/codegen/src/java/com/amd/aparapi/test/IEEERemainderFloat.java index 0cbe702afca637c0aa73b2d721ee841ab82d6de7..4f77849beb196cffbe421b9f09c59eddf7d70b3d 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IEEERemainderFloat.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IEEERemainderFloat.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class IEEERemainderFloat extends Kernel{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/If.java b/test/codegen/src/java/com/amd/aparapi/test/If.java index e40d516822583434e8cd2e7e3ca8ec2cfb25b934..752e3b8e847183764d6b8c71bd1b53496b0b08b7 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/If.java +++ b/test/codegen/src/java/com/amd/aparapi/test/If.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class If{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfAnd.java index 9bb079721c8fbde5d2a6da5bfbb083545b159de5..0348095e6ad8898bf22ec5a2e8b336d4c5bf2d8b 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfAnd.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfAnd.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfAnd{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfAndAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfAndAnd.java index 9001ef9bf0a4565c8fc00f24000fcd8ac5bc9ae6..093b91f96f2b2edc9077a4b57526e309333a421f 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfAndAnd.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfAndAnd.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfAndAnd{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfAndAndAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfAndAndAnd.java index 8d806d64c9bf639585f6866c4582a151277ec27b..a517357deb7bb0a7f843e4c19426a9942d671542 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfAndAndAnd.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfAndAndAnd.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfAndAndAnd{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfAndOrAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfAndOrAnd.java index 5ab566cfe2482130a0ca3bddd66e9ca033801ce3..e9935cb125d2893f4d0d847c5e76ee545c10b14e 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfAndOrAnd.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfAndOrAnd.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfAndOrAnd{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndAnd.java index 27d5b2ca12005dfd094217edd3a2a7bfbefd7583..8c47ed3259c3400a7593128409621ca3ef2b6dd8 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndAnd.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndAnd.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfBooleanAndAndAnd{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndOr.java index 6e5b45ede651762d686253962866f52d6af4f9ab..d599f136157b28bf48909b99cfa9465063a4e98b 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndOr.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndOr.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfBooleanAndAndOr{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrAnd.java index 9bcf2b478ae33af5de84ced78bae933e0c387399..bf23115a47834c234aca842c8d632510a25323f0 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrAnd.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrAnd.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfBooleanAndOrAnd{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrOr.java index e7d4a907bc64b4d01569039623ed432ec9e38fff..c50999650a24ede5cfa2b33faf1f7530ab3c73e5 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrOr.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrOr.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfBooleanAndOrOr{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndAnd.java index 57d8caf38ae83498480a36a3b1823c3cd3d462eb..379d978b74423e4166e7fa54f1f429246ce29a2e 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndAnd.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndAnd.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfBooleanOrAndAnd{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndOr.java index 20f21de6cf3153fe1eb9cdd0fdbfb8219e968861..fcfa06fbc34ab48d803a8a6ca03e3e94efef5869 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndOr.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndOr.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfBooleanOrAndOr{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrAnd.java index fecb00b41ce86f69cf91c3e8c179f93fd3850a54..f08acea6a44c302665f844c037fc1ad0e25bfe84 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrAnd.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrAnd.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfBooleanOrOrAnd{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrOr.java index 280cac6d564040a9e4aeaeebc679bcc707d1a9bc..08d39929d02d328fbf54d86b537d35d99488bdf1 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrOr.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrOr.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfBooleanOrOrOr{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElse.java b/test/codegen/src/java/com/amd/aparapi/test/IfElse.java index 3d10170cf3d40929a9475b3206faaf578052e65e..8b32a20fbf97c6ec59df3ee91efe79096af6a981 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfElse.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfElse.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfElse{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElseAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfElseAnd.java index 3cfdc736fc7a9e73f09f9b2aa0ac2d68957fd816..9a4da81754fa101d7e4d0045c81302df38167116 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfElseAnd.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfElseAnd.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfElseAnd{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElseAndAndAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfElseAndAndAnd.java index c9fda1a9f41b216066014c9f0ee1793ffd0f1a49..d72e5f03ccd43e8e00a836f3aeb90de754c7ba63 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfElseAndAndAnd.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfElseAndAndAnd.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfElseAndAndAnd{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElseIfElseIfElse.java b/test/codegen/src/java/com/amd/aparapi/test/IfElseIfElseIfElse.java index b86ccb470ea70466963de5d0c5cc705333d5a959..354706d663abd695f7c26248feb6b9008ee4cc1d 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfElseIfElseIfElse.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfElseIfElseIfElse.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfElseIfElseIfElse{ /* diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElseNot__OrOr_And_.java b/test/codegen/src/java/com/amd/aparapi/test/IfElseNot__OrOr_And_.java index eb3ca863b210196bab775f9b89b2321d19f78510..14b58b6e0ad3de31f2fcdcbea29e5ed41739a0a6 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfElseNot__OrOr_And_.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfElseNot__OrOr_And_.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfElseNot__OrOr_And_{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrAnd.java index 69f3b55822183e8c267c6e14384bbe22a4cb8973..ceccfbfa793e83404b93d8363402c70434fab2da 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrAnd.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrAnd.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfElseOrOrAnd{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrOr.java index ee108e25b61a7c9cd2a455511cf9576532819e02..51d46360edb855ef6ba2c4ecdcadd8b6d7bd9d5f 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrOr.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrOr.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfElseOrOrOr{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElse_And_Or_And.java b/test/codegen/src/java/com/amd/aparapi/test/IfElse_And_Or_And.java index c76aa16057273bfda104d5cff9c049eda5ce49ee..6ea9e269d2f85967b5c11989ea5814830b34a36d 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfElse_And_Or_And.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfElse_And_Or_And.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfElse_And_Or_And{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElse_OrOr_And.java b/test/codegen/src/java/com/amd/aparapi/test/IfElse_OrOr_And.java index df3426415e9dc7b2737a189242c2c87d36249308..2f63e57f6f4d51b4b8a965cf9826d3242dcabb3e 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfElse_OrOr_And.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfElse_OrOr_And.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfElse_OrOr_And{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElse_Or_And_Or.java b/test/codegen/src/java/com/amd/aparapi/test/IfElse_Or_And_Or.java index 3a151cdf45ba7dd8fde64b70dad7f41980519d2e..0f8b1dd87f820b1ecb10fe06a8695dfb5866b248 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfElse_Or_And_Or.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfElse_Or_And_Or.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfElse_Or_And_Or{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfOr.java index 510552736a13b4baea1c762d234a3b4e87e576fb..13f97d7e4ad76fc3a77c016a4ddd364e500d7d07 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfOr.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfOr.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfOr{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfOrAndOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfOrAndOr.java index 550e1f95af31e30ff611d08a72641771fdb7879b..52f59e946b05639a8f9bad7c0057f6275220e62c 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfOrAndOr.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfOrAndOr.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfOrAndOr{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfOrOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfOrOr.java index d7e73fa75164cda25125a0b9f2c5e14ee0430300..203a328eb91692fe0cea5ad89293eaf9a735b750 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfOrOr.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfOrOr.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfOrOr{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfOrOrAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfOrOrAnd.java index 54e5cc605fe9dbaa0b694d150ce1fdc5f2370534..cef7db132c2aecec5c1662899de229aabd66718a 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfOrOrAnd.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfOrOrAnd.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfOrOrAnd{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfOrOrOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfOrOrOr.java index 194defeb3ab4a93e4dfad934d404e36491f62934..e288b4cae4756922141c17cf2cfcee1ea3fa4bdf 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IfOrOrOr.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IfOrOrOr.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IfOrOrOr{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_IfElseIfElseElse_Else.java b/test/codegen/src/java/com/amd/aparapi/test/If_IfElseIfElseElse_Else.java index b558f4ea36027e2c37fc2220a79e8e2cd28b82ec..ec7a9fa4122dc8b40eefa063351fc221df2f09f4 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/If_IfElseIfElseElse_Else.java +++ b/test/codegen/src/java/com/amd/aparapi/test/If_IfElseIfElseElse_Else.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class If_IfElseIfElseElse_Else{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else.java b/test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else.java index 0a9cb86bac440f6d5a8bb2976ee2fc28cd0e2504..4f9fa38d4acd9f5bf7b73a2d53e59a0892a2c53b 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else.java +++ b/test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class If_IfElse_Else{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else_IfElse_.java b/test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else_IfElse_.java index 6ec9dd1f637a1fdb07392d63defcc8faffa62d68..90cb6461d4dd98055dc9f22a54f7832db7753afe 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else_IfElse_.java +++ b/test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else_IfElse_.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class If_IfElse_Else_IfElse_{ /* diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_If_Else.java b/test/codegen/src/java/com/amd/aparapi/test/If_If_Else.java index 0770db0a0a8f61ca1eaee0858ab12dcaa2a326b7..2c692f9bce553995a33f4dfddfd8c8a9b797c132 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/If_If_Else.java +++ b/test/codegen/src/java/com/amd/aparapi/test/If_If_Else.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class If_If_Else{ /* diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_If_Else2.java b/test/codegen/src/java/com/amd/aparapi/test/If_If_Else2.java index 49f8bf45c1ae938bde1140e6dd9f4011d2a25a73..b107d347bd3111a365e155642fb655d1e9b70a27 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/If_If_Else2.java +++ b/test/codegen/src/java/com/amd/aparapi/test/If_If_Else2.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class If_If_Else2{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_If_Else_If_.java b/test/codegen/src/java/com/amd/aparapi/test/If_If_Else_If_.java index 3ea6b21a0ddb334e39f16e45facffe332f4a1c4f..447b9a73b0ad60b9040d20b0e91949c4018199f3 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/If_If_Else_If_.java +++ b/test/codegen/src/java/com/amd/aparapi/test/If_If_Else_If_.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class If_If_Else_If_{ /* diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_OrOr_And.java b/test/codegen/src/java/com/amd/aparapi/test/If_OrOr_And.java index ce9210bdb92f68f2c8b88dc721b75103ddbdfea2..26bc03af389ceae1b584dfd066517dd9a5b703df 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/If_OrOr_And.java +++ b/test/codegen/src/java/com/amd/aparapi/test/If_OrOr_And.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class If_OrOr_And{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_While_Else.java b/test/codegen/src/java/com/amd/aparapi/test/If_While_Else.java index a766c76dd2456c74b866fa28ac5dc5f96217398e..c5ae2488ce77b5af1eace0e4e8e478056ed1881f 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/If_While_Else.java +++ b/test/codegen/src/java/com/amd/aparapi/test/If_While_Else.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class If_While_Else{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_While_Else_While.java b/test/codegen/src/java/com/amd/aparapi/test/If_While_Else_While.java index 6bb02914497407f2a0e54a0f6b7d59203388783c..d3422e03fea64f7322a471bd1eaa1dba33403ce4 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/If_While_Else_While.java +++ b/test/codegen/src/java/com/amd/aparapi/test/If_While_Else_While.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class If_While_Else_While{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/ImplementsInterface.java b/test/codegen/src/java/com/amd/aparapi/test/ImplementsInterface.java index b6efc40eec3cebe2ca92eacfcaf3f3eb5452ddc1..f9c709d8b2f4cb1fde583ab190c94cd2e7184a2a 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ImplementsInterface.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ImplementsInterface.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; interface IFoo{ public int bar(int n); diff --git a/test/codegen/src/java/com/amd/aparapi/test/IncArrayArgContent.java b/test/codegen/src/java/com/amd/aparapi/test/IncArrayArgContent.java index 41ff198a7affd66946aad14d80db619775578d41..5edca7d5f0648100cdb3ead0f011404ceab17a13 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IncArrayArgContent.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IncArrayArgContent.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IncArrayArgContent{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/IncField.java b/test/codegen/src/java/com/amd/aparapi/test/IncField.java index 31655b597d22544c19e356ce555f2d0aca2042f6..989116116aa11317826f3390c54c4d56cdee7c08 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IncField.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IncField.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class IncField{ int field = 1024; diff --git a/test/codegen/src/java/com/amd/aparapi/test/IndirectRecursion.java b/test/codegen/src/java/com/amd/aparapi/test/IndirectRecursion.java index 3d09d5686d10391da7fd359609fe295c3538d301..237490a8dadc0715fd84bc84cdec8b0e30358df9 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/IndirectRecursion.java +++ b/test/codegen/src/java/com/amd/aparapi/test/IndirectRecursion.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class IndirectRecursion extends Kernel{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/Interface.java b/test/codegen/src/java/com/amd/aparapi/test/Interface.java index e94857c89599937d4af23b678918bdd77e671678..5b2df20f68eb574d609d112a3615e267503be6b5 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/Interface.java +++ b/test/codegen/src/java/com/amd/aparapi/test/Interface.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class Interface{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/LongCompare.java b/test/codegen/src/java/com/amd/aparapi/test/LongCompare.java index e4f75bb890e0b1c0fc66f5b1d678003c9fa098e2..4e44cd5a832e9b2fe52ef4e76e51c930061cc177 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/LongCompare.java +++ b/test/codegen/src/java/com/amd/aparapi/test/LongCompare.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class LongCompare extends Kernel{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/LongCompares.java b/test/codegen/src/java/com/amd/aparapi/test/LongCompares.java index 676c284f294e4259c22c54658dad83fea1a2a2e9..dd588f556eca361e253e0ab4f9aed1fd78b14518 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/LongCompares.java +++ b/test/codegen/src/java/com/amd/aparapi/test/LongCompares.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class LongCompares{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/Loops.java b/test/codegen/src/java/com/amd/aparapi/test/Loops.java index ea65c717d74125871a882b481a34b6f5055275e2..ab2675dbf94ece4b0634e66b7223a84120dee8f9 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/Loops.java +++ b/test/codegen/src/java/com/amd/aparapi/test/Loops.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class Loops{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/MathAbs.java b/test/codegen/src/java/com/amd/aparapi/test/MathAbs.java index 5c2c66685ca126a4594ece6ee5d5ee92c3a0b132..3e2d4b305d25afd9734c1b97ff0b1a0137280f0e 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/MathAbs.java +++ b/test/codegen/src/java/com/amd/aparapi/test/MathAbs.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class MathAbs extends Kernel{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/MathDegRad.java b/test/codegen/src/java/com/amd/aparapi/test/MathDegRad.java index e9ccce4712253450450a0a367a2b872e75c13a84..fcaf819f1d8f34339e6d499bc658c4f869c96a99 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/MathDegRad.java +++ b/test/codegen/src/java/com/amd/aparapi/test/MathDegRad.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class MathDegRad extends Kernel{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/MathFallThru.java b/test/codegen/src/java/com/amd/aparapi/test/MathFallThru.java index d6834fcfdbc8414dd1871c55fb17c94bee4aba89..0fa5ddd7ab294f5a78189d250552979270f820f4 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/MathFallThru.java +++ b/test/codegen/src/java/com/amd/aparapi/test/MathFallThru.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class MathFallThru extends Kernel{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/MathMax.java b/test/codegen/src/java/com/amd/aparapi/test/MathMax.java index f80f227142204b65cba8509deff8ec224fc62997..46f5f10d4048b332fb4bc9cab9fddfb6dd2cc8d4 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/MathMax.java +++ b/test/codegen/src/java/com/amd/aparapi/test/MathMax.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class MathMax extends Kernel{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/MathMin.java b/test/codegen/src/java/com/amd/aparapi/test/MathMin.java index 675daf88c3a9d9778baf7baeb251722081b573c1..1ea619c014578015d4dd0b7a1f4a0f793496e7bd 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/MathMin.java +++ b/test/codegen/src/java/com/amd/aparapi/test/MathMin.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class MathMin extends Kernel{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/MathRemainder.java b/test/codegen/src/java/com/amd/aparapi/test/MathRemainder.java index cd28d818835dc5c21155f25b0e75d76163c9bb71..5dd8651225e895a9100e5fd0959e9012720a014a 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/MathRemainder.java +++ b/test/codegen/src/java/com/amd/aparapi/test/MathRemainder.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class MathRemainder extends Kernel{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/MultiContinue.java b/test/codegen/src/java/com/amd/aparapi/test/MultiContinue.java index ba0a6a3fd32cdcc0a94e7b20c1a482d911e8c04b..2985221f64948ef44798eabe91226331bbaea193 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/MultiContinue.java +++ b/test/codegen/src/java/com/amd/aparapi/test/MultiContinue.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class MultiContinue{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/MultipleAssign.java b/test/codegen/src/java/com/amd/aparapi/test/MultipleAssign.java index effa7c149323c5e72cdfb1657f32352740f0a27d..e1c42284d573a47d9657b4837a588abac9acf398 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/MultipleAssign.java +++ b/test/codegen/src/java/com/amd/aparapi/test/MultipleAssign.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class MultipleAssign{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/MultipleAssignExpr.java b/test/codegen/src/java/com/amd/aparapi/test/MultipleAssignExpr.java index 08534fd5849c6806e1e1dbde6e19644e7328284b..205d5a74043882e94a3833c2041e706d05069a36 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/MultipleAssignExpr.java +++ b/test/codegen/src/java/com/amd/aparapi/test/MultipleAssignExpr.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class MultipleAssignExpr{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/NaN.java b/test/codegen/src/java/com/amd/aparapi/test/NaN.java index cc7c2eb2ce73c74ab071b6da13e88ece29290809..628d5689bd3210adf7eb9e062e19110926077056 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/NaN.java +++ b/test/codegen/src/java/com/amd/aparapi/test/NaN.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class NaN extends Kernel{ @Override public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/NewLocalArray.java b/test/codegen/src/java/com/amd/aparapi/test/NewLocalArray.java index c61b426720e55ebf94e7bd926470fab127245b5f..f7b30a5268019c00ebb25a70893879b9eb04d525 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/NewLocalArray.java +++ b/test/codegen/src/java/com/amd/aparapi/test/NewLocalArray.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class NewLocalArray{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/NonNullCheck.java b/test/codegen/src/java/com/amd/aparapi/test/NonNullCheck.java index e8296d73aaf7dd13f54c7b4616fed2d9fc68e4e6..939788b5d19567c2aa4db58bfa7ae546e60e5e82 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/NonNullCheck.java +++ b/test/codegen/src/java/com/amd/aparapi/test/NonNullCheck.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class NonNullCheck{ int[] ints = new int[1024]; diff --git a/test/codegen/src/java/com/amd/aparapi/test/NullCheck.java b/test/codegen/src/java/com/amd/aparapi/test/NullCheck.java index 8a6970a10f993b47eacfa00ab140cc3419494f48..6fdf348328d1538f5c21469a32f3dbea941c34d7 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/NullCheck.java +++ b/test/codegen/src/java/com/amd/aparapi/test/NullCheck.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class NullCheck{ int[] ints = new int[1024]; diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCallHierarchy.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCallHierarchy.java index 4e14321f42f29748d00dc437cf0b43b3ae441c08..d1a7146173b05433b1b1bf8cf39b5adea7fd5b4d 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCallHierarchy.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCallHierarchy.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class ObjectArrayCallHierarchy extends Kernel{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCommonSuper.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCommonSuper.java index 8ff25588175ee5f8e317f95e2838347d865c8da6..5adf7e6719b22d4f1ed14e300b0a77bdbd4c501c 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCommonSuper.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCommonSuper.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class ObjectArrayCommonSuper extends Kernel{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberAccess.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberAccess.java index b09a9a47bee4adfbbb69ec1b393e1ec3b22559a1..968ab6a21f65f0887f6e354fd7a267e451d9f022 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberAccess.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberAccess.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class ObjectArrayMemberAccess extends Kernel{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadGetter.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadGetter.java index c7824a3e3e56b5dd273d91fed0656974a23c6d18..5e5959618cdb029a7938dd7984bda00c3ae73f60 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadGetter.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadGetter.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class ObjectArrayMemberBadGetter extends Kernel{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadSetter.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadSetter.java index dc2aab960d0f1c0d33abf3660a33beaad1b7ee16..ddccc4c1f97c7ef1e76fe7f5b016f426f78be796 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadSetter.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadSetter.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class ObjectArrayMemberBadSetter extends Kernel{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberCall.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberCall.java index f705de5c3c60cae55055b781f3e10f8b055b3923..65ccd3dccedaa0460562ee6b0c226a1e082f4d32 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberCall.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberCall.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class ObjectArrayMemberCall extends Kernel{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberGetterSetter.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberGetterSetter.java index 9a0f99d64bf97fe5d20ad51912476516aafac0c1..6e6593ddcf60ee31813523de16f5e88577b2cc82 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberGetterSetter.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberGetterSetter.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; final class DummyOOA{ int mem; diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberHierarchy.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberHierarchy.java index 1e55d305caa364629f7a88aebe01c882f4c27e5c..d4538a545ea05ffaa82b1b82a3c4ff31631e2886 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberHierarchy.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberHierarchy.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class ObjectArrayMemberHierarchy extends Kernel{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberNotFinal.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberNotFinal.java index 51ee65cc8e6e0a035cce993346081fbe77a3ed6f..ea79772ec06d5fcfded0145cec1bab90ae84d3ea 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberNotFinal.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberNotFinal.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class DummyOOANF{ int mem; diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectRefCopy.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectRefCopy.java index 8a79f1fd32940478021475457d4b70226a8dbe7b..68fe61ce8148c6e7c14a4c9d491c85300814a196 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ObjectRefCopy.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ObjectRefCopy.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class ObjectRefCopy extends Kernel{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectWithinObject.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectWithinObject.java index 906adf62915339b9594f4813e2ce82626ab24f95..049b7fe35d83dd69f1b96d77447c9ffaf4871b83 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ObjectWithinObject.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ObjectWithinObject.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class ObjectWithinObject extends Kernel{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/OrAndOrPrecedence.java b/test/codegen/src/java/com/amd/aparapi/test/OrAndOrPrecedence.java index 72b3b5c992367e00344b98578dfbab1ef6205591..bbe9ef9666d5ca1950bc2b9389f83dd65993e61b 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/OrAndOrPrecedence.java +++ b/test/codegen/src/java/com/amd/aparapi/test/OrAndOrPrecedence.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class OrAndOrPrecedence{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/OverloadMethod.java b/test/codegen/src/java/com/amd/aparapi/test/OverloadMethod.java index 94b925ea416c594a069511e3b189e6d08a4a163a..962f5c6fcb952dc0944c6d2ba8ca85039f4ffe48 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/OverloadMethod.java +++ b/test/codegen/src/java/com/amd/aparapi/test/OverloadMethod.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class OverloadMethod extends Kernel{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/OverriddenKernelField.java b/test/codegen/src/java/com/amd/aparapi/test/OverriddenKernelField.java index 1c6ee6c9709881a6c6644eda6ec60424fdf2ddac..7668e8a410bc85827a001b5a79b93d252f87c470 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/OverriddenKernelField.java +++ b/test/codegen/src/java/com/amd/aparapi/test/OverriddenKernelField.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; class OverriddenKernelFieldParent extends Kernel{ int out[] = new int[1]; diff --git a/test/codegen/src/java/com/amd/aparapi/test/PlayPen.java b/test/codegen/src/java/com/amd/aparapi/test/PlayPen.java index 06d06b06bf9fd66419a605298e4757deffa30fe7..e55b1099e96d59460db3a6d7be3a8153f6a0d6e9 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PlayPen.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PlayPen.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PlayPen{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostDecArrayItem.java b/test/codegen/src/java/com/amd/aparapi/test/PostDecArrayItem.java index 100d0170186baf56fae3ccf0654d52ee2cfa169d..a06ee3306a55cfcdc5520fb464350437eb9d18cb 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PostDecArrayItem.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PostDecArrayItem.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PostDecArrayItem{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostDecByte.java b/test/codegen/src/java/com/amd/aparapi/test/PostDecByte.java index ecd90c10d9c245b7e117a4516deadd7b9bffa996..58476eba707088ef8f7d5b22bbcc87611a4e61c1 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PostDecByte.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PostDecByte.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PostDecByte{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostDecLocal.java b/test/codegen/src/java/com/amd/aparapi/test/PostDecLocal.java index 995d271577d3291222a4294a29e087d56e305557..e2104cc045fa8163150533801a9defa7266a25a7 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PostDecLocal.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PostDecLocal.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PostDecLocal{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostDecPostInc.java b/test/codegen/src/java/com/amd/aparapi/test/PostDecPostInc.java index b14c5afb876db1a611f193e17bdf3a95740e0a14..8153d2b2314237e2a6f4cf620a1925c2b400c75c 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PostDecPostInc.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PostDecPostInc.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PostDecPostInc{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayIndexAndElement.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayIndexAndElement.java index b9dc78ab880416d02a21d5c134fdfaabd90180d0..03f0122ea2861d59e53e56b479c2c1ca5d1ca4b0 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayIndexAndElement.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayIndexAndElement.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PostIncArrayIndexAndElement{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItem.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItem.java index 6e4ba68b5dbff7a1355de33c3c16f34653709428..742039c0a26a78264509e5814709677d8ac2d7e1 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItem.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItem.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PostIncArrayItem{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemAsParameter.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemAsParameter.java index 8004570a4bc42980351d02a00b072c33edbc8935..0a54d9d1fe0e14fe14c10bda13d50810c1251d19 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemAsParameter.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemAsParameter.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PostIncArrayItemAsParameter{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemFieldIndex.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemFieldIndex.java index e3615055be00c28b4a09b163d98c51b09f63a261..8748df3b602c8263e1fb35018090a012a42e41dd 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemFieldIndex.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemFieldIndex.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PostIncArrayItemFieldIndex{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncByte.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncByte.java index d232dea0e1cde9b17cac5abf5997dbaeddf16dc1..ad84ceb0170db28b0915a4d2f6ab6089d660471f 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PostIncByte.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PostIncByte.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PostIncByte{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncByteField.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncByteField.java index ddb1ace2a347eee4e4d7cc2b4ea9b62a1532c440..f5810a20e07cc2c54a5288c201ad78276050d34f 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PostIncByteField.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PostIncByteField.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PostIncByteField{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncInt.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncInt.java index dfce4e6d556aa801df136e63847e4af7970f3a1d..0b567d860c6a76a92ee1f54c9741dd2c0cb1272f 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PostIncInt.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PostIncInt.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PostIncInt{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncIntField.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncIntField.java index fa9f7651f7b545d5e27e5bd9899b479c1ad608d7..ef28c2c7b0e77103bddb5d3fac5387ec7569461f 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PostIncIntField.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PostIncIntField.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PostIncIntField{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncLocal.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncLocal.java index 1521303b4ee80b2c40140b317263c9ee93fb2fd6..0c115da9a32111276525d80ad403e4c327348ec7 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PostIncLocal.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PostIncLocal.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PostIncLocal{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncLocalStandalone.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncLocalStandalone.java index 72f5e30ea3775e6afe23d235a5c771a955c42330..bf94c2e33877762bb92d9fde342947a6c158e9eb 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PostIncLocalStandalone.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PostIncLocalStandalone.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PostIncLocalStandalone{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncLocalTwice.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncLocalTwice.java index 95e9b88e4aab3619b176173143f384535bfc8ff1..9059c2320f49e3a4d3353ef7d747327131428bcd 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PostIncLocalTwice.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PostIncLocalTwice.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PostIncLocalTwice{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreDecArrayIndexAndElement.java b/test/codegen/src/java/com/amd/aparapi/test/PreDecArrayIndexAndElement.java index b3fbe59980f16af80a6d1180540d56f30503a69a..895be94740a94545f40b5d9e39f629deda3fae81 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PreDecArrayIndexAndElement.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PreDecArrayIndexAndElement.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PreDecArrayIndexAndElement{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreDecArrayItem.java b/test/codegen/src/java/com/amd/aparapi/test/PreDecArrayItem.java index 69aeee0ac707725bf66f0f00b764acb1db585128..fcc93d1b4494e7ae249b37ddb3bfbca99cc33741 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PreDecArrayItem.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PreDecArrayItem.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PreDecArrayItem{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreDecPostInc.java b/test/codegen/src/java/com/amd/aparapi/test/PreDecPostInc.java index 5ea331e9131b9ca94b2e9dd768d689178046ec2c..f31f98fb34ce6e2ec17faf0d074b904f243298aa 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PreDecPostInc.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PreDecPostInc.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PreDecPostInc{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncArrayIndexAndElement.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncArrayIndexAndElement.java index ac4957a8a67e9c9c764fb8d6e612e94d194de8de..341583c481cba81a171dd35af2ff29ea7ba15af6 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PreIncArrayIndexAndElement.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PreIncArrayIndexAndElement.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PreIncArrayIndexAndElement{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncArrayItem.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncArrayItem.java index 499f9fba044f67f62e7bd9fdf62bcdd1929f5c55..2295a2fe50e72b304da433a8bc29044d6952f8db 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PreIncArrayItem.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PreIncArrayItem.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PreIncArrayItem{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncByte.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncByte.java index 37042f6baab563dfee1e7d4835c424befc38166b..b9c47aecb69910254b1681f405c6a3f0288f5e79 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PreIncByte.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PreIncByte.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PreIncByte{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncByteField.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncByteField.java index 00e63591d87594716d6d3f81af732894d6944f2f..9d27660b4eb4366c7d9b068fcc42913c2745bce1 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PreIncByteField.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PreIncByteField.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PreIncByteField{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncInt.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncInt.java index 989fe61aa203383f59ad220bf038aee0368dec3b..7fd25bedcd99b747cff18c51cf233a8808d8137c 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PreIncInt.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PreIncInt.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PreIncInt{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncIntField.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncIntField.java index dd2c516f33272146603f72455830b9c1a0e6d868..0cecd153a57abe9c36e396f44b682efa23534a13 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PreIncIntField.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PreIncIntField.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PreIncIntField{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncLocal.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncLocal.java index 042ef524f08e54d57a286dd722e0c5e21ce2324b..bde0e40a3a0d5181cba2216aa1919e7ed2170db2 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PreIncLocal.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PreIncLocal.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PreIncLocal{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncLocalStandalone.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncLocalStandalone.java index 1a5bea8d2f5d6c3d8edfc427bc07a93d08659e8d..4ddf45bdde06d2114312b08000c4f8fa81aa6c72 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PreIncLocalStandalone.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PreIncLocalStandalone.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PreIncLocalStandalone{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncLocalTwice.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncLocalTwice.java index 4ad64a4905478a1bfd4ec1abdd572b5e0cc74743..3ef704a2f3b8020895bf6a85d4a8851ddfd7ed33 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/PreIncLocalTwice.java +++ b/test/codegen/src/java/com/amd/aparapi/test/PreIncLocalTwice.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class PreIncLocalTwice{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanNewArray.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanNewArray.java index b4ab0e3fe812698432ea4c57a2beb3bdf6a37185..2cc544669e42bc97dba292fe04b1af87099e3e1e 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanNewArray.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanNewArray.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ReturnBooleanNewArray{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanVarArray.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanVarArray.java index 488ef38c786b961e46ff7ef36df191ec5a85f2a2..d5f467574a987c155085a6b9632a02bb27f303d4 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanVarArray.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanVarArray.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ReturnBooleanVarArray{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayNew.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayNew.java index 7514bdb1476d5f70647d0d639ec90aac648d9fe9..5301223bc850a00bb1cdb68cf75f16410d57a849 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayNew.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayNew.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ReturnByteArrayNew{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayVar.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayVar.java index 699d002b95a4d554c347fbe59587c9a76fd293e1..7511b0d2d62ca9ff5993a6ec2daf9d7d3f51c81a 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayVar.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayVar.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ReturnByteArrayVar{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayNew.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayNew.java index efa5afaa8710a659b6a0b233e0fa612e59b56505..937673b33a939567d18a144f0b10b561112c7f47 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayNew.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayNew.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ReturnDoubleArrayNew{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayVar.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayVar.java index df561d96a528fa1f6e1e9f5d3a677db1c08716dd..9b76970fbf3f04ef918fc22c4a9ff551cad759a5 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayVar.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayVar.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ReturnDoubleArrayVar{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayNew.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayNew.java index 575a016d122b738929f08e4262688a5a2d3ba3eb..92d6251b1c627877625617b0b524fb18efe634dc 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayNew.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayNew.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ReturnFloatArrayNew{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayVar.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayVar.java index e937115fd933b32cd217851f20e73d00bc463c7c..f5a539cb36f1fa217b340b9acd85efae3a06c2dd 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayVar.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayVar.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ReturnFloatArrayVar{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayNew.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayNew.java index 864d7ebbf4406dd5e5cdbeb133abff7cd27b2d88..4d6662fa89259429e34a16317b144d26ff9f6323 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayNew.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayNew.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ReturnIntArrayNew{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayVar.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayVar.java index 5a4acff979eb1aa0f9b72079a4cf16a51582ede5..5995ae6f92470dd72f0c4d457314dd6416ea98ec 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayVar.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayVar.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ReturnIntArrayVar{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayNew.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayNew.java index 4b4ec765d20cd6c5ec032ade1027660eed172f25..e742b8ce1ff960aff7cc42dbb54fc3d9b0823689 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayNew.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayNew.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ReturnLongArrayNew{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayVar.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayVar.java index 2ba7c98874a3f473954d6cfe43b76fa35e403375..39abb6a83029aea51cc7a256619096e02819f846 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayVar.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayVar.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ReturnLongArrayVar{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnPostIncInt.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnPostIncInt.java index fd28a765e42a39f406fbd8f23b3146da50d8e46a..042691e8c8daa807f1217506d931a05f054bfaa8 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ReturnPostIncInt.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnPostIncInt.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ReturnPostIncInt{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnPreIncInt.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnPreIncInt.java index 106749f81f516607e5da9c4323f617ab98c7008d..5fdf913134c00185783cbeff3b9406b59c02cc81 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ReturnPreIncInt.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnPreIncInt.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ReturnPreIncInt{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayNew.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayNew.java index 60bf91b8e196243b851d8e541e8de575db4c3370..187039c95dd39cef57209a53d1e2225fc666b151 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayNew.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayNew.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ReturnShortArrayNew{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayVar.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayVar.java index 62cf2b9274e3336d01937d6be2192c83f4ff7990..f1239796d26105cc9e34e98fc9a07a02d0791d0c 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayVar.java +++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayVar.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class ReturnShortArrayVar{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/RightShifts.java b/test/codegen/src/java/com/amd/aparapi/test/RightShifts.java index 00968ea95c188419ab9331a65e96d10ebead491f..7220c7eed9b8feec099add4f1f7f0394d106484b 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/RightShifts.java +++ b/test/codegen/src/java/com/amd/aparapi/test/RightShifts.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class RightShifts extends Kernel{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/Sequence.java b/test/codegen/src/java/com/amd/aparapi/test/Sequence.java index 87d48633a37aabff5529005878ae2cc6685e6e3c..998c80b845cf07fabb3fee1c40abffe5ecd79f90 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/Sequence.java +++ b/test/codegen/src/java/com/amd/aparapi/test/Sequence.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class Sequence{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/StaticFieldStore.java b/test/codegen/src/java/com/amd/aparapi/test/StaticFieldStore.java index c0751a468742d084036101d273d6538aed5e550d..e8505208569aff43fcb3e7b323fa01147ada427d 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/StaticFieldStore.java +++ b/test/codegen/src/java/com/amd/aparapi/test/StaticFieldStore.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class StaticFieldStore{ int[] ints = new int[1024]; diff --git a/test/codegen/src/java/com/amd/aparapi/test/StaticMethodCall.java b/test/codegen/src/java/com/amd/aparapi/test/StaticMethodCall.java index 61229a5795ce95a7fc5bc5d7c41f50f3af7afa9e..4e01aa4be9970a33e8ed596eb745d7834636a18f 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/StaticMethodCall.java +++ b/test/codegen/src/java/com/amd/aparapi/test/StaticMethodCall.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class StaticMethodCall extends Kernel{ public static int add(int i, int j) { diff --git a/test/codegen/src/java/com/amd/aparapi/test/SynchronizedMethods.java b/test/codegen/src/java/com/amd/aparapi/test/SynchronizedMethods.java index bfca5a9a6507d4174efb19ad37927d91b4b2df07..6a88612034a64c0275f6bc34bfa1854f78dafd01 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/SynchronizedMethods.java +++ b/test/codegen/src/java/com/amd/aparapi/test/SynchronizedMethods.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class SynchronizedMethods{ int[] ints = new int[1024]; diff --git a/test/codegen/src/java/com/amd/aparapi/test/Ternary.java b/test/codegen/src/java/com/amd/aparapi/test/Ternary.java index 5c7363a3ffac486afad803b92fa9a175e4fe6052..6b805ecafa7901480790257c26ccbe028689c37f 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/Ternary.java +++ b/test/codegen/src/java/com/amd/aparapi/test/Ternary.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class Ternary{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/TernaryAnd.java b/test/codegen/src/java/com/amd/aparapi/test/TernaryAnd.java index 25c758121e5fe7203b698980e523505e4b7dea98..292d761118b4ca681cbffc8e28d1bb3d65b78853 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/TernaryAnd.java +++ b/test/codegen/src/java/com/amd/aparapi/test/TernaryAnd.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class TernaryAnd{ float random() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/TernaryAndOr.java b/test/codegen/src/java/com/amd/aparapi/test/TernaryAndOr.java index 1bc2e728985e82ea6ca2ab36de32ce3ae04ff5cc..5d3dc55f9af4d6c461dfcc486c35d2984985de6e 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/TernaryAndOr.java +++ b/test/codegen/src/java/com/amd/aparapi/test/TernaryAndOr.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class TernaryAndOr{ float random() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/TernaryNested.java b/test/codegen/src/java/com/amd/aparapi/test/TernaryNested.java index c46c925bcd8004acce307837863df5e958111def..b4e85978de31f0c55a0bd425e260722b37222c62 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/TernaryNested.java +++ b/test/codegen/src/java/com/amd/aparapi/test/TernaryNested.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class TernaryNested{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/TernaryOr.java b/test/codegen/src/java/com/amd/aparapi/test/TernaryOr.java index ab517f067ae3aa220c03852ce21cc50ed51b9508..63adad556f26553e7030d4f7d60e24e95804604f 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/TernaryOr.java +++ b/test/codegen/src/java/com/amd/aparapi/test/TernaryOr.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class TernaryOr{ float random() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/TwoForLoops.java b/test/codegen/src/java/com/amd/aparapi/test/TwoForLoops.java index 6e60e8166063c3bdf80e13bc5db1cf541a6a7784..5e09ff5d30f1f60e9c66b51e2a3e1123b1689cf8 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/TwoForLoops.java +++ b/test/codegen/src/java/com/amd/aparapi/test/TwoForLoops.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class TwoForLoops extends Kernel{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfElsesWithCommonEndByte.java b/test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfElsesWithCommonEndByte.java index 5e54e7726f39bc1f6b53660c969b1c36d664922b..fc7175d73cd0f814fe3814a3143b24fb8d0e3161 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfElsesWithCommonEndByte.java +++ b/test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfElsesWithCommonEndByte.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class UnrelatedIfElsesWithCommonEndByte{ /* diff --git a/test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfsWithCommonEndByte.java b/test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfsWithCommonEndByte.java index 353d4a6faa7d7975dd0c5d5b6b0e907153b37ee8..75658f1c94a0ee4484715c5a83ecbdf3fd3859ab 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfsWithCommonEndByte.java +++ b/test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfsWithCommonEndByte.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class UnrelatedIfsWithCommonEndByte{ int width = 1024; diff --git a/test/codegen/src/java/com/amd/aparapi/test/UnrelatedNestedIfElses.java b/test/codegen/src/java/com/amd/aparapi/test/UnrelatedNestedIfElses.java index 7b264fe3ec96136e30d25403e4d4dacda6865468..193b029b82d18463179ab8528ac2b77cc3713f2e 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/UnrelatedNestedIfElses.java +++ b/test/codegen/src/java/com/amd/aparapi/test/UnrelatedNestedIfElses.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class UnrelatedNestedIfElses{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/UseObject.java b/test/codegen/src/java/com/amd/aparapi/test/UseObject.java index 8571fe72156964e1b0fe57ab7971fd848b9c6af5..47a77872ce6724f126e17d09f5053448b8bacf3e 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/UseObject.java +++ b/test/codegen/src/java/com/amd/aparapi/test/UseObject.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class UseObject extends Kernel{ class Dummy{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/UseObjectArrayLength.java b/test/codegen/src/java/com/amd/aparapi/test/UseObjectArrayLength.java index da7989b8c3892eb8f72b13335257bb1c1f31fdc2..46fedec025b30773ae391490c11cbc42d82033cf 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/UseObjectArrayLength.java +++ b/test/codegen/src/java/com/amd/aparapi/test/UseObjectArrayLength.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class UseObjectArrayLength extends Kernel{ final class Dummy{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/UsesArrayLength.java b/test/codegen/src/java/com/amd/aparapi/test/UsesArrayLength.java index b73b50cc19e66002bfe2d0ccfae098f512024c53..ce2737828b8b091d35b9885126a6521c14e471cd 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/UsesArrayLength.java +++ b/test/codegen/src/java/com/amd/aparapi/test/UsesArrayLength.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; public class UsesArrayLength extends Kernel{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/UsesNew.java b/test/codegen/src/java/com/amd/aparapi/test/UsesNew.java index 19a96caab92ca3680e0e54233bdefebf75a66997..361f8506ee8adb94685c1f42bded9ec1a7136ad4 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/UsesNew.java +++ b/test/codegen/src/java/com/amd/aparapi/test/UsesNew.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class UsesNew{ int[] ints = new int[1024]; diff --git a/test/codegen/src/java/com/amd/aparapi/test/UsesThrow.java b/test/codegen/src/java/com/amd/aparapi/test/UsesThrow.java index ef1bcdc4523f96f50ff4a4b9953bd6a1208f1cb5..244e9515d06e5991717a7c59d76b00e39f147f35 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/UsesThrow.java +++ b/test/codegen/src/java/com/amd/aparapi/test/UsesThrow.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class UsesThrow{ int[] ints = new int[1024]; diff --git a/test/codegen/src/java/com/amd/aparapi/test/VarargsForEach.java b/test/codegen/src/java/com/amd/aparapi/test/VarargsForEach.java index 8c58a536f68497672168e9f9c9a573e19cf0ac47..bc67d8731fa627df3c762e1fecda7a434e53e38e 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/VarargsForEach.java +++ b/test/codegen/src/java/com/amd/aparapi/test/VarargsForEach.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class VarargsForEach{ public static int max(int... values) { diff --git a/test/codegen/src/java/com/amd/aparapi/test/VarargsSimple.java b/test/codegen/src/java/com/amd/aparapi/test/VarargsSimple.java index d6f0f89c40d8a7991b855834bcbec64c4492d67c..d7910f7b0302523b246e1f2125667943f66f4f30 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/VarargsSimple.java +++ b/test/codegen/src/java/com/amd/aparapi/test/VarargsSimple.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class VarargsSimple{ public static int max(int... values) { diff --git a/test/codegen/src/java/com/amd/aparapi/test/While.java b/test/codegen/src/java/com/amd/aparapi/test/While.java index 0e83ddce5e973d5171fe1a61792e9701dadc43e2..e9a0d63d7dc254c3281c1e0977e9f1a85bcd1767 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/While.java +++ b/test/codegen/src/java/com/amd/aparapi/test/While.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class While{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/WhileAndMandel.java b/test/codegen/src/java/com/amd/aparapi/test/WhileAndMandel.java index 6a0abcaf597ca7275fa40844c4a0b86239b15470..05dc8b4d091ab087ec64b339860b600b682801ce 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/WhileAndMandel.java +++ b/test/codegen/src/java/com/amd/aparapi/test/WhileAndMandel.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class WhileAndMandel{ int width = 1024; diff --git a/test/codegen/src/java/com/amd/aparapi/test/WhileEmptyLoop.java b/test/codegen/src/java/com/amd/aparapi/test/WhileEmptyLoop.java index f2543e8050dfbe31426b3879137f21467b5851d2..078e5f5f515588b36e5dd75e501c10aec9c9a86a 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/WhileEmptyLoop.java +++ b/test/codegen/src/java/com/amd/aparapi/test/WhileEmptyLoop.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class WhileEmptyLoop{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/WhileFloatCompound.java b/test/codegen/src/java/com/amd/aparapi/test/WhileFloatCompound.java index 14725223ac8253d6c43d5f3fcd2d0288cff08f01..15a0a970ab93415a5686912edd22d834ed74a863 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/WhileFloatCompound.java +++ b/test/codegen/src/java/com/amd/aparapi/test/WhileFloatCompound.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class WhileFloatCompound{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/WhileIf.java b/test/codegen/src/java/com/amd/aparapi/test/WhileIf.java index 4b61ca31901e7986f7c33c374855f617401200c8..1c33d480ab0d2bce1ebbb27f04f78fa5d5884d55 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/WhileIf.java +++ b/test/codegen/src/java/com/amd/aparapi/test/WhileIf.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class WhileIf{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/WhileIfElse.java b/test/codegen/src/java/com/amd/aparapi/test/WhileIfElse.java index 46cb1d71af1febab09d42ef59efe7b95a1cef3e7..360ab86a5a26c406361e891229d3ecea78d69cbe 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/WhileIfElse.java +++ b/test/codegen/src/java/com/amd/aparapi/test/WhileIfElse.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class WhileIfElse{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/WhileWithoutMutator.java b/test/codegen/src/java/com/amd/aparapi/test/WhileWithoutMutator.java index 48c4ace0caed4c597c8b5870282a4d4c8531ef73..4e42c22ee3e5107a49a640b36e07c8af2fbe2bdf 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/WhileWithoutMutator.java +++ b/test/codegen/src/java/com/amd/aparapi/test/WhileWithoutMutator.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class WhileWithoutMutator{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/While_If_IfElseElse.java b/test/codegen/src/java/com/amd/aparapi/test/While_If_IfElseElse.java index a3435a2a02d2a6de71ab6710d5f5d2a5247e19ee..886638bc9e16d262fd60ac034d4562603cc5a1b5 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/While_If_IfElseElse.java +++ b/test/codegen/src/java/com/amd/aparapi/test/While_If_IfElseElse.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class While_If_IfElseElse{ public void run() { diff --git a/test/codegen/src/java/com/amd/aparapi/test/WideInc.java b/test/codegen/src/java/com/amd/aparapi/test/WideInc.java index aa7bfa727849d989908fb41c20639aa3be58026c..cd576af638086f91edad64385d160752fc8bb734 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/WideInc.java +++ b/test/codegen/src/java/com/amd/aparapi/test/WideInc.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class WideInc{ diff --git a/test/codegen/src/java/com/amd/aparapi/test/WideLoad.java b/test/codegen/src/java/com/amd/aparapi/test/WideLoad.java index 30ce67fe9d6eb6ac0cd024b795ccd9256fde9420..53addecc30b8d67d0866932e26a0c07294d8d658 100644 --- a/test/codegen/src/java/com/amd/aparapi/test/WideLoad.java +++ b/test/codegen/src/java/com/amd/aparapi/test/WideLoad.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test; +package com.aparapi.test; public class WideLoad{ diff --git a/test/runtime/.project b/test/runtime/.project deleted file mode 100644 index 0b3d5824a64aab382ef7a19bde6c1f13c13de22c..0000000000000000000000000000000000000000 --- a/test/runtime/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>test-runtime</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/test/runtime/build.xml b/test/runtime/build.xml index 922e2b99ea7e509962b45a6f95febbda8d78f232..7ec849786b9321c7620e793a9a571086347ee2b9 100644 --- a/test/runtime/build.xml +++ b/test/runtime/build.xml @@ -43,7 +43,7 @@ </target> <path id="classpath"> - <pathelement path="${basedir}/../../com.syncleus.aparapi/dist/aparapi.jar" /> + <pathelement path="${basedir}/../../com.aparapi/dist/aparapi.jar" /> <pathelement path="${junit.home}/${junit.jar.name}" /> <pathelement path="classes" /> </path> @@ -63,7 +63,7 @@ <!-- even though fork is slower we need to set the library path and this requires fork --> <junit printsummary="false" fork="true" haltonfailure="false" failureproperty="tests.failed" showoutput="false"> - <sysproperty key="java.library.path" value="${basedir}/../../com.syncleus.aparapi.jni/dist" /> + <sysproperty key="java.library.path" value="${basedir}/../../com.aparapi.jni/dist" /> <formatter type="xml" /> <classpath refid="classpath" /> <batchtest todir="junit/data"> diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/BufferTransfer.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/BufferTransfer.java index 5858491577ea099739814c70803f6694e023b070..906b5e1e86c99ec6a6301ab3c94c7946e660e770 100644 --- a/test/runtime/src/java/com/amd/aparapi/test/runtime/BufferTransfer.java +++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/BufferTransfer.java @@ -1,8 +1,8 @@ -package com.syncleus.aparapi.test.runtime; +package com.aparapi.test.runtime; -import com.syncleus.aparapi.*; -import com.syncleus.aparapi.device.*; -import com.syncleus.aparapi.internal.kernel.*; +import com.aparapi.*; +import com.aparapi.device.*; +import com.aparapi.internal.kernel.*; import org.junit.*; import java.util.*; diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/CallStaticFromAnonymousKernel.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/CallStaticFromAnonymousKernel.java index 53f8c442de9a5f9417191859e9b09aad4a413e3c..37cdb04270eeabf061df687177d239b88d3f08fe 100644 --- a/test/runtime/src/java/com/amd/aparapi/test/runtime/CallStaticFromAnonymousKernel.java +++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/CallStaticFromAnonymousKernel.java @@ -1,7 +1,7 @@ -package com.syncleus.aparapi.test.runtime; +package com.aparapi.test.runtime; -import com.syncleus.aparapi.*; -import com.syncleus.aparapi.device.*; +import com.aparapi.*; +import com.aparapi.device.*; import org.junit.*; import static org.junit.Assert.*; diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/ExplicitBoolean.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/ExplicitBoolean.java index 5a82daf2f977a6b9231c7261cd0d3689aa3162a1..efcf5d1df4817a9780345ac629f7b204972df7b7 100644 --- a/test/runtime/src/java/com/amd/aparapi/test/runtime/ExplicitBoolean.java +++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/ExplicitBoolean.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test.runtime; +package com.aparapi.test.runtime; -import com.syncleus.aparapi.*; +import com.aparapi.*; import org.junit.*; import static org.junit.Assert.*; diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue102.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue102.java index 315be790855908a249e4b0010cbd9adf79330b5f..e71b3f2bb208c20b20fee28ba37bf79c53cbb6ce 100644 --- a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue102.java +++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue102.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test.runtime; +package com.aparapi.test.runtime; -import com.syncleus.aparapi.*; +import com.aparapi.*; import static org.junit.Assert.assertTrue; import org.junit.Test; diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue103.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue103.java index c112ba9ad78d32c56c60b76c6bb141e79bc2c0ea..646137b3bb07b801c9264505c56679b781d9f061 100644 --- a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue103.java +++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue103.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test.runtime; +package com.aparapi.test.runtime; -import com.syncleus.aparapi.*; +import com.aparapi.*; import static org.junit.Assert.*; import org.junit.Test; diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue68.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue68.java index c4b20570b26252778bc0a580e1deaefa843721de..d10a89bac24fcf1080f64ab76426465b2542e013 100644 --- a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue68.java +++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue68.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test.runtime; +package com.aparapi.test.runtime; -import com.syncleus.aparapi.Kernel; +import com.aparapi.Kernel; abstract class ArrayAccess{ protected ArrayAccess(int offset, int length) { diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue69.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue69.java index 8c71650b61df09b6954a28b6f11e9379c29be2b3..fe508fd6ad6341befd12b1fc62cc5ce71a036771 100644 --- a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue69.java +++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue69.java @@ -1,7 +1,7 @@ -package com.syncleus.aparapi.test.runtime; +package com.aparapi.test.runtime; -import com.syncleus.aparapi.Kernel; -import com.syncleus.aparapi.Range; +import com.aparapi.Kernel; +import com.aparapi.Range; public class Issue69{ diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/LoadCL.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/LoadCL.java index 637c88492bc7ba5e0c1ec94e12f4d119ac3edfad..2cfaeaf48ce9cc872b3f12a54e4b10f12476f318 100644 --- a/test/runtime/src/java/com/amd/aparapi/test/runtime/LoadCL.java +++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/LoadCL.java @@ -1,17 +1,17 @@ -package com.syncleus.aparapi.test.runtime; +package com.aparapi.test.runtime; -import com.syncleus.aparapi.*; -import com.syncleus.aparapi.device.*; -import com.syncleus.aparapi.internal.kernel.*; -import com.syncleus.aparapi.opencl.*; -import com.syncleus.aparapi.opencl.OpenCL.*; +import com.aparapi.*; +import com.aparapi.device.*; +import com.aparapi.internal.kernel.*; +import com.aparapi.opencl.*; +import com.aparapi.opencl.OpenCL.*; import org.junit.*; import static org.junit.Assert.*; public class LoadCL{ - @Resource("com/amd/aparapi/test/runtime/squarer.cl") interface Squarer extends OpenCL<Squarer>{ + @Resource("com/aparapi/test/runtime/squarer.cl") interface Squarer extends OpenCL<Squarer>{ public Squarer square(// Range _range,// @GlobalReadWrite("in") float[] in,// diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/RangeSize.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/RangeSize.java index 6e536e27c4d1a0385ca6343eadf31b865646c1dc..e3c4eeb4c896a3a64ac16f2f7b2d9dc950d4b8cb 100644 --- a/test/runtime/src/java/com/amd/aparapi/test/runtime/RangeSize.java +++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/RangeSize.java @@ -1,6 +1,6 @@ -package com.syncleus.aparapi.test.runtime; +package com.aparapi.test.runtime; -import com.syncleus.aparapi.Range; +import com.aparapi.Range; import static org.junit.Assert.*; diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/Test12x4_4x2.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/Test12x4_4x2.java index 3f9e24dd7ffff39bb2777cb6ea70303fe46ad53e..0cb0b0ae4451410d93b75a56c818827120beb445 100644 --- a/test/runtime/src/java/com/amd/aparapi/test/runtime/Test12x4_4x2.java +++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/Test12x4_4x2.java @@ -1,10 +1,10 @@ -package com.syncleus.aparapi.test.runtime; +package com.aparapi.test.runtime; -import com.syncleus.aparapi.device.*; +import com.aparapi.device.*; import org.junit.Test; -import com.syncleus.aparapi.Kernel; -import com.syncleus.aparapi.Range; +import com.aparapi.Kernel; +import com.aparapi.Range; public class Test12x4_4x2{ @SuppressWarnings("deprecation") diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/UseStaticArray.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/UseStaticArray.java index 06436a9e391eafccbad3f1279fe8688e02e5d3c4..ce3df09b41f8284aaa7cf18556101724580b2331 100644 --- a/test/runtime/src/java/com/amd/aparapi/test/runtime/UseStaticArray.java +++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/UseStaticArray.java @@ -1,7 +1,7 @@ -package com.syncleus.aparapi.test.runtime; +package com.aparapi.test.runtime; -import com.syncleus.aparapi.*; -import com.syncleus.aparapi.device.*; +import com.aparapi.*; +import com.aparapi.device.*; import org.junit.*; import static org.junit.Assert.*; diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/Util.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/Util.java index da0d2d6de1b8915e041bfbfb5443aba98b4731df..479df2a6ee73a9011531da4505efb4e4bdb766f8 100644 --- a/test/runtime/src/java/com/amd/aparapi/test/runtime/Util.java +++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/Util.java @@ -1,4 +1,4 @@ -package com.syncleus.aparapi.test.runtime; +package com.aparapi.test.runtime; import java.util.Arrays;