[clblas] 119/125: merged develop branch into master branch

[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 5a4782e079a24cd09ca27755bc8ed6052606f3bd
Merge: 7cdf31b 43a29df
Author: Timmy <timmy.liu at amd.com>
Date:   Fri Apr 10 15:55:31 2015 -0500

    merged develop branch into master branch

 .travis.yml                                  |  14 +-
 src/CMakeLists.txt                           |  49 ++-
 src/FindOpenCL.cmake                         |   6 +
 src/clBLASConfig.cmake.in                    |   3 +
 src/clBLASConfigVersion.cmake.in             |  46 +++
 src/client/CMakeLists.txt                    |   4 +-
 src/include/granulation.h                    |   2 +
 src/library/CMakeLists.txt                   |  11 +-
 src/library/blas/generic/common.c            |   4 +-
 src/library/blas/gens/blas_kgen.h            |  15 +
 src/library/blas/gens/fetch.c                |   8 +-
 src/library/blas/gens/gemm.c                 |  13 +-
 src/library/blas/gens/syrxk.c                |  16 +-
 src/library/blas/gens/tilemul.c              |  85 +++++
 src/library/blas/include/blas_funcs.h        |   1 +
 src/library/blas/xgemm.c                     | 526 ++++++++++++++++++++++++++-
 src/library/tools/ktest/naive/naive_blas.cpp |   4 +-
 src/library/tools/tune/CMakeLists.txt        |   4 +-
 src/library/tools/tune/subdim.c              |   2 +-
 src/tests/CMakeLists.txt                     |   3 +
 src/tests/copyTestDependencies.cmake.in      |   5 +
 src/tests/correctness/tcase-filter.cpp       |   4 +-
 src/tests/correctness/test-correctness.cpp   |   5 +
 src/tests/gtest.cmake                        |  79 ++++
 24 files changed, 857 insertions(+), 52 deletions(-)

diff --cc src/CMakeLists.txt
index 41b54ab,126ce28..389a9a2
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -50,7 -51,7 +51,7 @@@ if( NOT DEFINED clBLAS_VERSION_MAJOR 
  endif( )
  
  if( NOT DEFINED clBLAS_VERSION_MINOR )
-     set( clBLAS_VERSION_MINOR 2 )
 -    set( clBLAS_VERSION_MINOR 3 )
++    set( clBLAS_VERSION_MINOR 4 )
  endif( )
  
  if( NOT DEFINED clBLAS_VERSION_PATCH )

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