[clblas] 30/125: Adding guards around the clBLAS version numbers, to support an external script setting the library version through the command line -D mechanism. Changing the name of AMD_CLBLAS_STORAGE_PATH to CLBLAS_STORAGE_PATH Bugfix for clAmdBlasCgemm() in wrapper legacy header; eliminated the offX parameters which were not present in original header

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository clblas.

commit 7ba6961e31aa1e1849ffa69cd16a990a3ed4be4c
Author: Kent Knox <kent.knox at amd>
Date:   Wed Sep 25 16:08:29 2013 -0500

    Adding guards around the clBLAS version numbers, to support an external script setting the library version
    through the command line -D mechanism.
    Changing the name of AMD_CLBLAS_STORAGE_PATH to CLBLAS_STORAGE_PATH
    Bugfix for clAmdBlasCgemm() in wrapper legacy header; eliminated the offX parameters which were not present in original
    header
---
 src/CMakeLists.txt                  | 15 ++++++++++++---
 src/clAmdBlas.h                     |  3 ---
 src/library/tools/tune/storage_io.c |  2 +-
 src/library/tools/tune/tune.c       |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 92bfb16..a515242 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -45,9 +45,18 @@ else( )
 endif( )
 
 # Define a version for the code
-set( clBLAS_VERSION_MAJOR 2 )
-set( clBLAS_VERSION_MINOR 1 )
-set( clBLAS_VERSION_PATCH 0 )
+if( NOT DEFINED clBLAS_VERSION_MAJOR )
+    set( clBLAS_VERSION_MAJOR 2 )
+endif( )
+
+if( NOT DEFINED clBLAS_VERSION_MINOR )
+    set( clBLAS_VERSION_MINOR 1 )
+endif( )
+
+if( NOT DEFINED clBLAS_VERSION_PATCH )
+    set( clBLAS_VERSION_PATCH 0 )
+endif( )
+
 set( clBLAS_VERSION "${clBLAS_VERSION_MAJOR}.${clBLAS_VERSION_MINOR}.${clBLAS_VERSION_PATCH}")
 
 # Increment this if we break backward compatibility.
diff --git a/src/clAmdBlas.h b/src/clAmdBlas.h
index 1921473..c994ecc 100644
--- a/src/clAmdBlas.h
+++ b/src/clAmdBlas.h
@@ -8528,14 +8528,11 @@ clAmdBlasCgemm(
     size_t K,
     FloatComplex alpha,
     const cl_mem A,
-    size_t offA,
     size_t lda,
     const cl_mem B,
-    size_t offB,
     size_t ldb,
     FloatComplex beta,
     cl_mem C,
-    size_t offC,
     size_t ldc,
     cl_uint numCommandQueues,
     cl_command_queue *commandQueues,
diff --git a/src/library/tools/tune/storage_io.c b/src/library/tools/tune/storage_io.c
index b90792b..8fd3ec8 100644
--- a/src/library/tools/tune/storage_io.c
+++ b/src/library/tools/tune/storage_io.c
@@ -24,7 +24,7 @@
 #include "storage_data.h"
 
 #define  SUBDIM_UNUSED_FILE_VALUE 10000
-const char *ENV_FILE_PATH = "AMD_CLBLAS_STORAGE_PATH";
+const char *ENV_FILE_PATH = "CLBLAS_STORAGE_PATH";
 const char *FileID  = "CBS";
 const char *FileExt = "kdb";
 const char *FileExtTmp = "kdb.tmp";
diff --git a/src/library/tools/tune/tune.c b/src/library/tools/tune/tune.c
index 17d7d47..8050cb5 100644
--- a/src/library/tools/tune/tune.c
+++ b/src/library/tools/tune/tune.c
@@ -2641,7 +2641,7 @@ main(int argc, char*  argv[])
     clblasSetup();
 
     if (!FILE_PATH){
-        printf("The environment variable 'AMD_CLBLAS_STORAGE_PATH' is not defined\n");
+        printf("The environment variable 'CLBLAS_STORAGE_PATH' is not defined\n");
         exit(EXIT_COD_NO_ENVIRONMENT_VARIABLE);
     }
 

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