[clblas] 10/61: fix travis CI build

[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 eff87f9f06c0023f171c15d8d04e179d2b77dcc3
Author: Timmy <timmy.liu at amd.com>
Date:   Fri Apr 17 17:17:05 2015 -0500

    fix travis CI build
---
 .travis.yml                                  | 22 ++++++++++++++++++++--
 src/library/blas/functor/functor_selector.cc |  4 +++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1a18d83..f6289e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,16 +5,34 @@ compiler:
 
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -qq fglrx opencl-headers libboost-program-options-dev
+  - sudo apt-get install -qq fglrx libboost-program-options-dev
 # Uncomment below to help verify the installs above work
 #  - ls -la /usr/lib/libboost*
 #  - ls -la /usr/include/boost
 
 before_script:
   - cd ${TRAVIS_BUILD_DIR}
+# download OpenCL 1.2 header files since Travis CI only provides 1.1
+  - mkdir -p OpenCLInclude/CL
+  - cd OpenCLInclude/CL
+  #- wget -r --no-parent -nH --cut-dirs=4 --reject="index.html*" https://www.khronos.org/registry/cl/api/1.2/
+  - wget https://www.khronos.org/registry/cl/api/1.2/cl.h
+  - wget https://www.khronos.org/registry/cl/api/1.2/cl.hpp
+  - wget https://www.khronos.org/registry/cl/api/1.2/cl_d3d10.h
+  - wget https://www.khronos.org/registry/cl/api/1.2/cl_d3d11.h
+  - wget https://www.khronos.org/registry/cl/api/1.2/cl_dx9_media_sharing.h
+  - wget https://www.khronos.org/registry/cl/api/1.2/cl_egl.h
+  - wget https://www.khronos.org/registry/cl/api/1.2/cl_ext.h
+  - wget https://www.khronos.org/registry/cl/api/1.2/cl_gl.h
+  - wget https://www.khronos.org/registry/cl/api/1.2/cl_gl_ext.h
+  - wget https://www.khronos.org/registry/cl/api/1.2/cl_platform.h
+  - wget https://www.khronos.org/registry/cl/api/1.2/opencl.h
+  - ls
+  - pwd
+  - cd ../..
   - mkdir -p bin/clBLAS
   - cd bin/clBLAS
-  - cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TEST=OFF -DBUILD_CLIENT=ON -DCMAKE_INSTALL_PREFIX:PATH=$PWD/package ../../src
+  - cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TEST=OFF -DBUILD_CLIENT=ON -DOPENCL_INCLUDE_DIRS:PATH=$PWD/../../OpenCLInclude -DCMAKE_INSTALL_PREFIX:PATH=$PWD/package ../../src
 
 script: 
   - make install
diff --git a/src/library/blas/functor/functor_selector.cc b/src/library/blas/functor/functor_selector.cc
index 676ad35..6ec3873 100644
--- a/src/library/blas/functor/functor_selector.cc
+++ b/src/library/blas/functor/functor_selector.cc
@@ -96,7 +96,8 @@ clblasFunctorSelector::find(DeviceChip chip)
 
 int clblasFunctorSelector::FindFirePro(cl_device_id device)
 {
-  char cardName [1024];
+  return 1;
+  /*char cardName [1024];
   cl_int error = clGetDeviceInfo(device, CL_DEVICE_BOARD_NAME_AMD, sizeof(cardName), cardName, NULL);
   if (error!=CL_SUCCESS)
     return 0;
@@ -104,6 +105,7 @@ int clblasFunctorSelector::FindFirePro(cl_device_id device)
     return 1;
   else
     return 0;
+  */
 }
 
 // =================================================================================

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