[clblas] 36/54: Attempt to build from souce if build from binary fails

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/sid
in repository clblas.

commit bef2f6b7977c9c8b3a39953558a48640cf6736be
Author: Pavan Yalamanchili <pavan at arrayfire.com>
Date:   Tue Dec 15 19:29:52 2015 -0500

    Attempt to build from souce if build from binary fails
---
 src/library/blas/xgemm.cc | 19 +++++++++++++++----
 src/library/blas/xtrsm.cc | 19 +++++++++++++++----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/library/blas/xgemm.cc b/src/library/blas/xgemm.cc
index 5ec2006..bfb133a 100644
--- a/src/library/blas/xgemm.cc
+++ b/src/library/blas/xgemm.cc
@@ -176,21 +176,32 @@ void makeGemmKernel(
     if (*kernelBinary) {
 #ifdef AUTOGEMM_PRINT_DEBUG
       printf("makeGemmKernel: pre-compiled binary found: %llu bytes\n", *kernelBinarySize);
+      printf("makeGemmKernel: Creating program from binary\n");
 #endif
       clProgram = clCreateProgramWithBinary(
         clContext,
         1, &clDevice,
         kernelBinarySize, kernelBinary,
         &clBinaryStatus, &err );
-      CL_CHECK(err)
+#ifdef AUTOGEMM_PRINT_DEBUG
+      if (err != CL_SUCCESS) {
+          printf("makeGemmKernel: Failed to create program with binary\n");
+      }
+#endif
       err = clBuildProgram(
         clProgram,
         1, &clDevice,
         binaryBuildOptions, NULL, NULL );
-      CL_CHECK(err)
-    } else {
 #ifdef AUTOGEMM_PRINT_DEBUG
-      printf("makeGemmKernel: Creating program from source\n", *kernelBinarySize);
+      if (err != CL_SUCCESS) {
+          printf("makeGemmKernel: Failed to build program from binary\n");
+      }
+#endif
+    }
+
+    if (!*kernelBinary || err != CL_SUCCESS) {
+#ifdef AUTOGEMM_PRINT_DEBUG
+      printf("makeGemmKernel: Creating program from source\n");
 #endif
       clProgram = clCreateProgramWithSource(
         clContext,
diff --git a/src/library/blas/xtrsm.cc b/src/library/blas/xtrsm.cc
index fb92dfc..b6f553b 100644
--- a/src/library/blas/xtrsm.cc
+++ b/src/library/blas/xtrsm.cc
@@ -189,21 +189,32 @@ void makeKernel(
     if (*kernelBinary) {
 #ifdef AUTOGEMM_PRINT_DEBUG
       printf("makeKernel: pre-compiled binary found: %llu bytes\n", *kernelBinarySize);
+      printf("makeKernel: Creating program from binary\n");
 #endif
       clProgram = clCreateProgramWithBinary(
         clContext,
         1, &clDevice,
         kernelBinarySize, kernelBinary,
         &clBinaryStatus, &err );
-      CL_CHECK(err)
+#ifdef AUTOGEMM_PRINT_DEBUG
+      if (err != CL_SUCCESS) {
+          printf("makeKernel: Failed to create program with binary\n");
+      }
+#endif
       err = clBuildProgram(
         clProgram,
         1, &clDevice,
         binaryBuildOptions, NULL, NULL );
-      CL_CHECK(err)
-    } else {
 #ifdef AUTOGEMM_PRINT_DEBUG
-      printf("makeKernel: Creating program from source\n", *kernelBinarySize);
+      if (err != CL_SUCCESS) {
+          printf("makeKernel: Failed to build program from binary\n");
+      }
+#endif
+    }
+
+    if (!*kernelBinary || err != CL_SUCCESS) {
+#ifdef AUTOGEMM_PRINT_DEBUG
+      printf("makeKernel: Creating program from source\n");
 #endif
       clProgram = clCreateProgramWithSource(
         clContext,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clblas.git