JavaCL: don't try to load cached binaries for programs created from binaries! (issue #453)

ochafik · ochafik · commit 12bd9f8bfd08 · 2013-11-04T22:29:46.000Z
diff --git a/Core/src/main/velocity/com/nativelibs4java/opencl/CLProgram.java b/Core/src/main/velocity/com/nativelibs4java/opencl/CLProgram.java
@@ -732,7 +732,7 @@ public synchronized CLProgram build() throws CLBuildException {
         String contentSignature = null;
         File cacheFile = null;
         boolean readBinaries = false;
-        if (isCached()) {
+        if (!loadedFromBinary && isCached()) {
         		try {
         			contentSignature = computeCacheSignature();
         			byte[] sha = java.security.MessageDigest.getInstance("MD5").digest(contentSignature.getBytes(textEncoding));
diff --git a/Core/src/test/java/com/nativelibs4java/opencl/BinaryKernelTest.java b/Core/src/test/java/com/nativelibs4java/opencl/BinaryKernelTest.java
@@ -10,10 +10,10 @@
 import static org.bridj.Pointer.*;
 import com.nativelibs4java.test.MiscTestUtils;
 import java.util.List;
+import org.junit.Ignore;
 import org.junit.runners.Parameterized;
 
 /**
- *
  * @author Kazo Csaba
  */
 @SuppressWarnings("unchecked")
@@ -64,4 +64,21 @@ public void simpleTest() throws CLBuildException {
 		for (int i=0; i<4; i++)
 			assertEquals(source.get(i), target.get(i));
     }
+    
+    /**
+     * Test from issue https://github.com/ochafik/nativelibs4java/issues/453
+     */
+    @Test
+    public void cachingTest() {
+        CLContext clcontext = JavaCL.createBestContext();
+        CLProgram ap = clcontext.createProgram("__kernel void add(int a, int b, __global int* c) { *c = a + b; }");
+        ap.createKernel("add");
+        Map<CLDevice, byte[]> addBins = ap.getBinaries();
+        Map<CLDevice, byte[]> subBins = clcontext.createProgram("__kernel void sub(int a, int b, __global int* c) { *c = a - b; }").getBinaries();
+        CLProgram ap2 = clcontext.createProgram(addBins, "__kernel void add(int a, int b, __global int* c) { *c = a + b; }");
+        ap2.createKernel("add");
+        CLProgram sp2 = clcontext.createProgram(subBins, "__kernel void sub(int a, int b, __global int* c) { *c = a - b; }");
+        sp2.setCached(true); // set to false and it works
+        sp2.createKernel("sub");
+    }
 }
