fix hard-coding of opencl version to 2.0; fix 1d initialization of 2d arrays.

Author: hughperkins

src/library/CMakeLists.txt

@@ -851,6 +851,7 @@ set(CLBLAS_ALL_SOURCES
 	#${USERGEMM_SRC}
 	#${USERGEMM_HEADERS}
 )
+add_definitions(-DOPENCL_VERSION="${OPENCL_VERSION}")
 add_library(clBLAS ${CLBLAS_ALL_SOURCES})
 add_dependencies(clBLAS GENERATE_CLT)
 

src/library/blas/AutoGemm/UserGemmKernelSources/UserGemmKernelSourceIncludes.h

@@ -9,8 +9,8 @@
 
 //**** compiler flags
 //**** online compilation flags
-const char * const User_srcBuildOptions = "-cl-std=CL2.0";
-const char * const User_binBuildOptions = "-cl-std=CL2.0";
+const char * const User_srcBuildOptions = "-cl-std=CL" OPENCL_VERSION;
+const char * const User_binBuildOptions = "-cl-std=CL" OPENCL_VERSION;
 
 
 extern const unsigned int sgemm_Col_NT_B1_MX032_NX064_KX16_ROW_workGroupNumRows;

src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NN_B0_MX048_NX048_KX08_src.cpp

@@ -96,7 +96,7 @@ __kernel void dgemm_Col_NN_B0_MX048_NX048_KX08 (
     C += offsetC;
 
 
-    double rC[6][6] = {(double)0};
+    double rC[6][6] = { {(double)0} };
     double rA[6];
     double rB[6];
   __local double lA[392];

src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NN_B1_MX048_NX048_KX08_src.cpp

@@ -94,7 +94,7 @@ __kernel void dgemm_Col_NN_B1_MX048_NX048_KX08 (
     C += offsetC;
 
 
-    double rC[6][6] = {(double)0};
+    double rC[6][6] = { {(double)0} };
     double rA[6];
     double rB[6];
 

src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NT_B0_MX048_NX048_KX08_src.cpp

@@ -108,7 +108,7 @@ const char * const dgemm_Col_NT_B0_MX048_NX048_KX08_src = STRINGIFY(
 \n    C    += offsetC;
 \n
 \n
-\n    double rC[6][6] = {(double)0};
+\n    double rC[6][6] = { {(double)0} };
 \n    double rA[6];
 \n    double rB[6];
 \n

src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NT_B1_MX048_NX048_KX08_src.cpp

@@ -107,7 +107,7 @@ const char * const dgemm_Col_NT_B1_MX048_NX048_KX08_src = STRINGIFY(
 \n    C    += offsetC;
 \n
 \n
-\n    double rC[6][6] = {(double)0};
+\n    double rC[6][6] = { {(double)0} };
 \n    double rA[6];
 \n    double rB[6];
 \n

src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_TN_B0_MX048_NX048_KX08_src.cpp

@@ -36,7 +36,7 @@ __kernel void dgemm_Col_TN_B0_MX048_NX048_KX08_src (
   uint const offsetB,
   uint const offsetC )
 {
-    double rC[6][6]  = {(double)0};
+    double rC[6][6]  = { {(double)0} };
     double rA[1][6];
     double rB[1][6];
 

src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_TN_B1_MX048_NX048_KX08_src.cpp

@@ -36,7 +36,7 @@ __kernel void dgemm_Col_TN_B1_MX048_NX048_KX08_src (
   uint const offsetB,
   uint const offsetC )
 {
-    double rC[6][6]  = {(double)0};
+    double rC[6][6]  = { {(double)0} };
     double rA[1][6];
     double rB[1][6];
 

src/library/blas/AutoGemm/UserGemmKernelSources/sgemm_Col_NN_B0_MX032_NX032_KX16_src.cpp

@@ -49,7 +49,7 @@ __kernel void sgemm_Col_NN_B0_MX032_NX032_KX16 (
   uint offsetB,
   uint offsetC)
 {
-    float rC[2][2]  = {(float)0};
+    float rC[2][2]  = { {(float)0} };
     float rA[1][2];
     float rB[1][2];
 

src/library/blas/AutoGemm/UserGemmKernelSources/sgemm_Col_NN_B0_MX064_NX064_KX16_src.cpp

@@ -65,7 +65,7 @@ __kernel void sgemm_Col_NN_B0_MX064_NX064_KX16 (
   uint offsetB,
   uint offsetC)
 {
-    float rC[4][4]  = {(float)0};
+    float rC[4][4]  = { {(float)0} };
     float rA[1][4];
     float rB[1][4];