From ed38cc3652f51e1ba0d8cbf97e78f2fd345a9ca0 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 23 Mar 2015 00:19:10 +0000 Subject: [PATCH 01/16] Travis CI: Experiment with pocl --- .travis.yml | 9 +++------ scripts/install_pocl.sh | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-) create mode 100755 scripts/install_pocl.sh diff --git a/.travis.yml b/.travis.yml index d8bf3b6c..863d0785 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,13 @@ language: java - jdk: - oraclejdk8 - openjdk6 - cache: directories: - $HOME/.m2 - env: - MAVEN_OPTS=-Xmx512m CL_LOG_ERRORS=stdout - before_install: - - sudo apt-get update -qq - - sudo apt-get install -qq fglrx=2:8.960-0ubuntu1 opencl-headers +- sudo apt-get update -qq +- sudo apt-get install -qq fglrx=2:8.960-0ubuntu1 opencl-headers +- script/install_pocl.sh diff --git a/scripts/install_pocl.sh b/scripts/install_pocl.sh new file mode 100755 index 00000000..32181902 --- /dev/null +++ b/scripts/install_pocl.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +set -e + +# On mac: sudo port install libtool +sudo apt-get install -qq libltdl-dev +sudo apt-get install -qq ocl-icd-libopencl1 + +git clone https://github.com/pocl/pocl.git +cd pocl +./autogen.sh + +# --disable-icd +./configure +make + +sudo make install From fc17545ddd8a75bdde78da9969d3843e454bfb31 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 23 Mar 2015 00:36:44 +0000 Subject: [PATCH 02/16] travis ci: install pocl in before_script? --- .travis.yml | 6 +++++- scripts/install_pocl.sh | 4 ---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 863d0785..ef73471a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,4 +10,8 @@ env: before_install: - sudo apt-get update -qq - sudo apt-get install -qq fglrx=2:8.960-0ubuntu1 opencl-headers -- script/install_pocl.sh +# On mac: sudo port install libtool +- sudo apt-get install -qq libltdl-dev +- sudo apt-get install -qq ocl-icd-libopencl1 +before_script: +- ./script/install_pocl.sh diff --git a/scripts/install_pocl.sh b/scripts/install_pocl.sh index 32181902..6c449ff5 100755 --- a/scripts/install_pocl.sh +++ b/scripts/install_pocl.sh @@ -2,10 +2,6 @@ set -e -# On mac: sudo port install libtool -sudo apt-get install -qq libltdl-dev -sudo apt-get install -qq ocl-icd-libopencl1 - git clone https://github.com/pocl/pocl.git cd pocl ./autogen.sh From 3977befc070f9759dfeb5aaebcdc7bf62281493e Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 23 Mar 2015 00:45:07 +0000 Subject: [PATCH 03/16] travis ci: add universe repo where ocl-icd-libopencl1 should be --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index ef73471a..0f9e218c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,9 @@ cache: env: - MAVEN_OPTS=-Xmx512m CL_LOG_ERRORS=stdout before_install: +- lsb_release -c; +- lsb_release -r; +- sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse" - sudo apt-get update -qq - sudo apt-get install -qq fglrx=2:8.960-0ubuntu1 opencl-headers # On mac: sudo port install libtool From c982e6ee487edc428bcec8f072bdbdc81d5656ab Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 23 Mar 2015 00:53:32 +0000 Subject: [PATCH 04/16] travis ci: add trusty repos --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0f9e218c..a5174075 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,10 @@ cache: env: - MAVEN_OPTS=-Xmx512m CL_LOG_ERRORS=stdout before_install: -- lsb_release -c; -- lsb_release -r; +- lsb_release -c +- lsb_release -r - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse" +- sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main universe multiverse restricted" - sudo apt-get update -qq - sudo apt-get install -qq fglrx=2:8.960-0ubuntu1 opencl-headers # On mac: sudo port install libtool From 7c287a0c10abe42880defb09a25ad862dea1d362 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 23 Mar 2015 01:02:37 +0000 Subject: [PATCH 05/16] travis ci: typo --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a5174075..dfc9eda3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,5 +17,4 @@ before_install: # On mac: sudo port install libtool - sudo apt-get install -qq libltdl-dev - sudo apt-get install -qq ocl-icd-libopencl1 -before_script: -- ./script/install_pocl.sh +- ./scripts/install_pocl.sh From 46a3d43d6b83263bbf3d4ed39712093c3500e97a Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 23 Mar 2015 01:07:49 +0000 Subject: [PATCH 06/16] travis ci: install beignet --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index dfc9eda3..8b1f68bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,5 @@ before_install: - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse" - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main universe multiverse restricted" - sudo apt-get update -qq -- sudo apt-get install -qq fglrx=2:8.960-0ubuntu1 opencl-headers -# On mac: sudo port install libtool -- sudo apt-get install -qq libltdl-dev -- sudo apt-get install -qq ocl-icd-libopencl1 +- sudo apt-get install -qq fglrx=2:8.960-0ubuntu1 beignet opencl-headers ocl-icd-libopencl1 libltdl-dev hwloc - ./scripts/install_pocl.sh From d4868f3e547a845957c652a9d23c292db48a94dc Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 23 Mar 2015 01:14:37 +0000 Subject: [PATCH 07/16] travis ci: beignet only --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8b1f68bb..b1fe060f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,4 +14,4 @@ before_install: - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main universe multiverse restricted" - sudo apt-get update -qq - sudo apt-get install -qq fglrx=2:8.960-0ubuntu1 beignet opencl-headers ocl-icd-libopencl1 libltdl-dev hwloc -- ./scripts/install_pocl.sh +# - ./scripts/install_pocl.sh From 3b15ee4ae8c0e5d1e4e70bd21145eff6e8143cbc Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 23 Mar 2015 01:22:45 +0000 Subject: [PATCH 08/16] travis ci: start X for beignet --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index b1fe060f..e6f03d8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,4 +14,7 @@ before_install: - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main universe multiverse restricted" - sudo apt-get update -qq - sudo apt-get install -qq fglrx=2:8.960-0ubuntu1 beignet opencl-headers ocl-icd-libopencl1 libltdl-dev hwloc +- export DISPLAY=:99.0 +- sh -e /etc/init.d/xvfb start + # - ./scripts/install_pocl.sh From d3e38b0efc9cc4d5eb17d53401685122ea5ef865 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 23 Mar 2015 01:34:09 +0000 Subject: [PATCH 09/16] try beignet's icd --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e6f03d8b..6844de5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,9 @@ before_install: - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse" - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main universe multiverse restricted" - sudo apt-get update -qq -- sudo apt-get install -qq fglrx=2:8.960-0ubuntu1 beignet opencl-headers ocl-icd-libopencl1 libltdl-dev hwloc +- sudo apt-get install -qq opencl-headers fglrx=2:8.960-0ubuntu1 beignet beignet-opencl-icd - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start +# ocl-icd-libopencl1 libltdl-dev hwloc # - ./scripts/install_pocl.sh From c6803acb792e824a5ec94b0f73435158358349ce Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 23 Mar 2015 01:39:43 +0000 Subject: [PATCH 10/16] travis ci: focus on pocl --- .travis.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6844de5c..d0c61b56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,9 +13,8 @@ before_install: - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse" - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main universe multiverse restricted" - sudo apt-get update -qq -- sudo apt-get install -qq opencl-headers fglrx=2:8.960-0ubuntu1 beignet beignet-opencl-icd -- export DISPLAY=:99.0 -- sh -e /etc/init.d/xvfb start - -# ocl-icd-libopencl1 libltdl-dev hwloc -# - ./scripts/install_pocl.sh +- sudo apt-get install -qq opencl-headers fglrx=2:8.960-0ubuntu1 ocl-icd-libopencl1 libltdl-dev hwloc +- ./scripts/install_pocl.sh +# - sudo apt-get install -qq opencl-headers fglrx=2:8.960-0ubuntu1 beignet beignet-opencl-icd +# - export DISPLAY=:99.0 +# - sh -e /etc/init.d/xvfb start From 014ea24d3952e360c24e4377a179223fe80239ec Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 23 Mar 2015 01:50:40 +0000 Subject: [PATCH 11/16] travis ci: libhwloc-dev for pocl --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d0c61b56..6d5e6a4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ before_install: - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse" - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main universe multiverse restricted" - sudo apt-get update -qq -- sudo apt-get install -qq opencl-headers fglrx=2:8.960-0ubuntu1 ocl-icd-libopencl1 libltdl-dev hwloc +- sudo apt-get install -qq opencl-headers fglrx=2:8.960-0ubuntu1 ocl-icd-libopencl1 libltdl-dev hwloc libhwloc-dev - ./scripts/install_pocl.sh # - sudo apt-get install -qq opencl-headers fglrx=2:8.960-0ubuntu1 beignet beignet-opencl-icd # - export DISPLAY=:99.0 From f5612a92143254f4f4719407aa9cc484933a1df9 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 23 Mar 2015 01:53:48 +0000 Subject: [PATCH 12/16] cliff is back --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d5e6a4f..51309945 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,9 @@ before_install: - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse" - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main universe multiverse restricted" - sudo apt-get update -qq -- sudo apt-get install -qq opencl-headers fglrx=2:8.960-0ubuntu1 ocl-icd-libopencl1 libltdl-dev hwloc libhwloc-dev +- sudo apt-get install -qq opencl-headers fglrx=2:8.960-0ubuntu1 ocl-icd-libopencl1 libltdl-dev hwloc libhwloc-dev clinfo +- clinfo - ./scripts/install_pocl.sh # - sudo apt-get install -qq opencl-headers fglrx=2:8.960-0ubuntu1 beignet beignet-opencl-icd -# - export DISPLAY=:99.0 +# - export DISPLAY=:99.0 clinfo # - sh -e /etc/init.d/xvfb start From 2f047ffe1e8923c723b68732d77f860fbfc339e1 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 23 Mar 2015 02:04:36 +0000 Subject: [PATCH 13/16] sudo clinfo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 51309945..4f004921 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ before_install: - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main universe multiverse restricted" - sudo apt-get update -qq - sudo apt-get install -qq opencl-headers fglrx=2:8.960-0ubuntu1 ocl-icd-libopencl1 libltdl-dev hwloc libhwloc-dev clinfo -- clinfo +- sudo clinfo - ./scripts/install_pocl.sh # - sudo apt-get install -qq opencl-headers fglrx=2:8.960-0ubuntu1 beignet beignet-opencl-icd # - export DISPLAY=:99.0 clinfo From 5b661f1531162252b366fcd4d3ab55b57de8bca6 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 23 Mar 2015 02:13:51 +0000 Subject: [PATCH 14/16] try prepackaged pocl from vivid --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4f004921..0da5ac75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,11 +11,10 @@ before_install: - lsb_release -c - lsb_release -r - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse" -- sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main universe multiverse restricted" +- sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu vivid main universe multiverse restricted" - sudo apt-get update -qq -- sudo apt-get install -qq opencl-headers fglrx=2:8.960-0ubuntu1 ocl-icd-libopencl1 libltdl-dev hwloc libhwloc-dev clinfo +- sudo apt-get install -qq opencl-headers fglrx=2:8.960-0ubuntu1 ocl-icd-libopencl1 clinfo libpocl1 - sudo clinfo -- ./scripts/install_pocl.sh # - sudo apt-get install -qq opencl-headers fglrx=2:8.960-0ubuntu1 beignet beignet-opencl-icd # - export DISPLAY=:99.0 clinfo # - sh -e /etc/init.d/xvfb start From f0cbad5424f458fd5c0f5f4bcb1affb677dcc1fb Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 23 Mar 2015 02:36:30 +0000 Subject: [PATCH 15/16] try again building pocl --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0da5ac75..e03d0d56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,9 @@ before_install: - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse" - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu vivid main universe multiverse restricted" - sudo apt-get update -qq -- sudo apt-get install -qq opencl-headers fglrx=2:8.960-0ubuntu1 ocl-icd-libopencl1 clinfo libpocl1 +- sudo apt-get install -qq opencl-headers fglrx=2:8.960-0ubuntu1 ocl-icd-libopencl1 libltdl-dev hwloc libhwloc-dev clinfo mesa-common-dev +# sudo apt-get install libpocl1 +- ./scripts/install_pocl.sh - sudo clinfo # - sudo apt-get install -qq opencl-headers fglrx=2:8.960-0ubuntu1 beignet beignet-opencl-icd # - export DISPLAY=:99.0 clinfo From 020af61a83b68ee69e3797c4346d29e1d2883d4b Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 23 Mar 2015 02:50:16 +0000 Subject: [PATCH 16/16] typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e03d0d56..7bcae399 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ before_install: - sudo apt-get install -qq opencl-headers fglrx=2:8.960-0ubuntu1 ocl-icd-libopencl1 libltdl-dev hwloc libhwloc-dev clinfo mesa-common-dev # sudo apt-get install libpocl1 - ./scripts/install_pocl.sh -- sudo clinfo +- clinfo # - sudo apt-get install -qq opencl-headers fglrx=2:8.960-0ubuntu1 beignet beignet-opencl-icd # - export DISPLAY=:99.0 clinfo # - sh -e /etc/init.d/xvfb start