Merge remote-tracking branch 'upstream/master' into caching
Conflicts: com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelRunner.java
Showing
- com.amd.aparapi.jni/build.xml 72 additions, 13 deletionscom.amd.aparapi.jni/build.xml
- com.amd.aparapi.jni/src/cpp/cltest.cpp 1 addition, 1 deletioncom.amd.aparapi.jni/src/cpp/cltest.cpp
- com.amd.aparapi.jni/src/cpp/invoke/OpenCLJNI.cpp 3 additions, 2 deletionscom.amd.aparapi.jni/src/cpp/invoke/OpenCLJNI.cpp
- com.amd.aparapi.jni/src/cpp/runKernel/JNIContext.cpp 2 additions, 0 deletionscom.amd.aparapi.jni/src/cpp/runKernel/JNIContext.cpp
- com.amd.aparapi.jni/src/cpp/runKernel/JNIContext.h 6 additions, 0 deletionscom.amd.aparapi.jni/src/cpp/runKernel/JNIContext.h
- com.amd.aparapi/src/java/com/amd/aparapi/Config.java 2 additions, 2 deletionscom.amd.aparapi/src/java/com/amd/aparapi/Config.java
- com.amd.aparapi/src/java/com/amd/aparapi/Kernel.java 10 additions, 5 deletionscom.amd.aparapi/src/java/com/amd/aparapi/Kernel.java
- com.amd.aparapi/src/java/com/amd/aparapi/device/Device.java 33 additions, 8 deletionscom.amd.aparapi/src/java/com/amd/aparapi/device/Device.java
- com.amd.aparapi/src/java/com/amd/aparapi/device/OpenCLDevice.java 19 additions, 0 deletions...aparapi/src/java/com/amd/aparapi/device/OpenCLDevice.java
- com.amd.aparapi/src/java/com/amd/aparapi/internal/jni/KernelRunnerJNI.java 12 additions, 0 deletions...rc/java/com/amd/aparapi/internal/jni/KernelRunnerJNI.java
- com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelRunner.java 40 additions, 19 deletions...rc/java/com/amd/aparapi/internal/kernel/KernelRunner.java
- samples/info/src/com/amd/aparapi/sample/info/Main.java 42 additions, 0 deletionssamples/info/src/com/amd/aparapi/sample/info/Main.java
- samples/squares/squares.sh 1 addition, 1 deletionsamples/squares/squares.sh
Loading
Please register or sign in to comment