From 1abd2b2eeb584e89d0a0ceae2dfee757db2f6ff2 Mon Sep 17 00:00:00 2001 From: Jakub Szuppe Date: Sat, 24 Feb 2018 11:55:01 +0100 Subject: [PATCH] Adjust .travis.yml to Travis CI changes --- .travis.yml | 336 +++++++++++++++---------------------------- .travis/amd_sdk.sh | 4 +- test/test_buffer.cpp | 2 +- 3 files changed, 122 insertions(+), 220 deletions(-) diff --git a/.travis.yml b/.travis.yml index 665995ab..5288693d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,24 +3,28 @@ language: cpp env: global: # Ubuntu version - - LINUX_DIST=precise + - LINUX_DIST=trusty - DEPS_DIR=${TRAVIS_BUILD_DIR}/deps + # CMake + - CMAKE_URL=https://cmake.org/files/v3.10/cmake-3.10.0-Linux-x86_64.tar.gz # OpenCL - OPENCL_LIB=default - - OPENCL_HEADERS_VER="21" + - OPENCL_HEADERS_VER="22" # Khronos OpenCL ICD - OPENCL_REGISTRY=https://www.khronos.org/registry/cl - OPENCL_ROOT=${DEPS_DIR}/opencl # POCL - - POCL_BRANCH=release_0_13 # branch/tag - #- POCL_COMMIT= # commit id - - POCL_LLVM_VERSION=3.8.0 + - POCL_BRANCH=release_1_0 # branch/tag + - POCL_LLVM_VERSION=5.0.1 + - POCL_ROOT=${OPENCL_ROOT}/pocl-${POCL_BRANCH}/ - POCL_LLVM_CONFIG=${DEPS_DIR}/llvm-${POCL_LLVM_VERSION}/bin/llvm-config - POCL_CXX_COMPILER=${DEPS_DIR}/llvm-${POCL_LLVM_VERSION}/bin/clang++ - POCL_C_COMPILER=${DEPS_DIR}/llvm-${POCL_LLVM_VERSION}/bin/clang + - POCL_OPENCL_LIB=${POCL_ROOT}/lib/libOpenCL.so # AMD APP SDK - AMDAPPSDKROOT=${OPENCL_ROOT}/AMDAPPSDK # Global build options and C++ flags + - GCC_VERSION=4.8 - CMAKE_OPTIONS="-DBOOST_COMPUTE_BUILD_TESTS=ON -DBOOST_COMPUTE_BUILD_EXAMPLES=ON -DBOOST_COMPUTE_BUILD_BENCHMARKS=ON -DBOOST_COMPUTE_USE_OFFLINE_CACHE=ON -DBOOST_COMPUTE_HAVE_OPENCV=ON -DBOOST_COMPUTE_THREAD_SAFE=ON" - CXX_FLAGS="-Wall -pedantic -Werror -Wno-variadic-macros -Wno-long-long -Wno-shadow -DCI_BUILD" # Boost @@ -32,10 +36,11 @@ env: matrix: include: ############################################################################ - # POCL builds (OpenCL 1.0, 1.1) + # POCL builds (OpenCL 1.0, 1.1, 1.2) ############################################################################ # Trusty, OpenCL 1.0 + # CLANG - os: linux dist: trusty sudo: required @@ -44,10 +49,6 @@ matrix: apt: packages: &trusty_pocl_packages - g++-4.8 - # clang and llvm 3.7 for POCL (llvm-toolchain-trusty-3.7 is not whitelisted) - # - clang-3.7 - # - llvm-3.7 - # - llvm-3.7-dev (...) # POCL - libltdl-dev - libhwloc-dev @@ -68,13 +69,12 @@ matrix: - libopencv-dev sources: &trusty_pocl_sources - ubuntu-toolchain-r-test - # - llvm-toolchain-trusty-3.7 (not whitelisted yet https://github.com/travis-ci/apt-source-whitelist/issues/199) env: - - LINUX_DIST=trusty - OPENCL_LIB=pocl - - OPENCL_HEADERS_VER="21" + - OPENCL_HEADERS_VER="22" - ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=100" - - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${OPENCL_ROOT}/pocl/lib/libOpenCL.so -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" + - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${POCL_OPENCL_LIB} -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" + # GCC - os: linux dist: trusty sudo: required @@ -84,12 +84,12 @@ matrix: packages: *trusty_pocl_packages sources: *trusty_pocl_sources env: - - LINUX_DIST=trusty - OPENCL_LIB=pocl - - OPENCL_HEADERS_VER="21" - - ENV_CXX_FLAGS="-DBOOST_COMPUTE_MAX_CL_VERSION=100" - - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${OPENCL_ROOT}/pocl/lib/libOpenCL.so -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" + - OPENCL_HEADERS_VER="22" + - ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=100" + - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${POCL_OPENCL_LIB} -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" # Trusty, OpenCL 1.1 + # CLANG - os: linux dist: trusty sudo: required @@ -99,11 +99,11 @@ matrix: packages: *trusty_pocl_packages sources: *trusty_pocl_sources env: - - LINUX_DIST=trusty - OPENCL_LIB=pocl - - OPENCL_HEADERS_VER="21" + - OPENCL_HEADERS_VER="22" - ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=101" - - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${OPENCL_ROOT}/pocl/lib/libOpenCL.so -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" + - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${POCL_OPENCL_LIB} -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" + # GCC - os: linux dist: trusty sudo: required @@ -113,165 +113,50 @@ matrix: packages: *trusty_pocl_packages sources: *trusty_pocl_sources env: - - LINUX_DIST=trusty - OPENCL_LIB=pocl - - OPENCL_HEADERS_VER="21" - - ENV_CXX_FLAGS="-DBOOST_COMPUTE_MAX_CL_VERSION=101" - - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${OPENCL_ROOT}/pocl/lib/libOpenCL.so -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" - - ############################################################################ - # Khronos ICD builds (without running tests) (OpenCL 1.2, 2.0) - ############################################################################ - - # # Precise, OpenCL 1.2, Travis CI container-based infrastructure - # - os: linux - # sudo: false - # compiler: clang - # addons: - # apt: - # packages: &precise_icd_packages - # - g++-4.8 - # # Boost - # - libboost-chrono1.55-dev - # - libboost-date-time1.55-dev - # - libboost-test1.55-dev - # - libboost-system1.55-dev - # - libboost-filesystem1.55-dev - # - libboost-timer1.55-dev - # - libboost-program-options1.55-dev - # - libboost-thread1.55-dev - # # Misc - # - python-yaml - # - lcov - # - libopencv-dev - # sources: &precise_icd_sources - # - ubuntu-toolchain-r-test - # - llvm-toolchain-precise-3.7 - # - boost-latest - # env: - # - RUN_TEST=false - # - OPENCL_LIB=khronos-icd - # - OPENCL_HEADERS_VER="12" - # - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${OPENCL_ROOT}/lib/libOpenCL.so -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" - # - os: linux - # sudo: false - # compiler: gcc - # addons: - # apt: - # packages: *precise_icd_packages - # sources: *precise_icd_sources - # env: - # - RUN_TEST=false - # - OPENCL_LIB=khronos-icd - # - OPENCL_HEADERS_VER="12" - # - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${OPENCL_ROOT}/lib/libOpenCL.so -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" - # # Precise, OpenCL 2.0, Travis CI container-based infrastructure - # - os: linux - # sudo: false - # compiler: clang - # addons: - # apt: - # packages: *precise_icd_packages - # sources: *precise_icd_sources - # env: - # - RUN_TEST=false - # - OPENCL_LIB=khronos-icd - # - OPENCL_HEADERS_VER="20" - # - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${OPENCL_ROOT}/lib/libOpenCL.so -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" - # - os: linux - # sudo: false - # compiler: gcc - # addons: - # apt: - # packages: *precise_icd_packages - # sources: *precise_icd_sources - # env: - # - RUN_TEST=false - # - OPENCL_LIB=khronos-icd - # - OPENCL_HEADERS_VER="20" - # - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${OPENCL_ROOT}/lib/libOpenCL.so -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" + - OPENCL_HEADERS_VER="22" + - ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=101" + - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${POCL_OPENCL_LIB} -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" + # Trusty, OpenCL 1.2 + # CLANG + - os: linux + dist: trusty + sudo: required + compiler: clang + addons: + apt: + packages: *trusty_pocl_packages + sources: *trusty_pocl_sources + env: + - OPENCL_LIB=pocl + - OPENCL_HEADERS_VER="22" + - ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=102" + - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${POCL_OPENCL_LIB} -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" + # GCC + - os: linux + dist: trusty + sudo: required + compiler: gcc + addons: + apt: + packages: *trusty_pocl_packages + sources: *trusty_pocl_sources + env: + - OPENCL_LIB=pocl + - OPENCL_HEADERS_VER="22" + - ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=102" + - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${POCL_OPENCL_LIB} -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" ############################################################################ # AMD APP SDK builds (v2.9.1 -> OpenCL 1.2, v3.0 -> OpenCL 2.0) ############################################################################ - # Precise, AMD APP SDK v2.9.1, Travis CI container-based infrastructure - - os: linux - sudo: false - compiler: clang - addons: - apt: - packages: &precise_amdappsdk_packages - - g++-4.8 - # Boost - - libboost-chrono1.55-dev - - libboost-date-time1.55-dev - - libboost-test1.55-dev - - libboost-system1.55-dev - - libboost-filesystem1.55-dev - - libboost-timer1.55-dev - - libboost-program-options1.55-dev - - libboost-thread1.55-dev - # Misc - - python-yaml - - lcov - - libopencv-dev - sources: &precise_amdappsdk_sources - - ubuntu-toolchain-r-test - - boost-latest - env: - - OPENCL_LIB=amdappsdk - - OPENCL_HEADERS_VER="21" - - AMDAPPSDK_VERSION=291 # OpenCL 1.2 - - ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=102" - - ENV_CMAKE_OPTIONS="-DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" - # Build is disabled as it's reduntant with the Coveralls build (see below) - # - os: linux - # sudo: false - # compiler: gcc - # addons: - # apt: - # packages: *precise_amdappsdk_packages - # sources: *precise_amdappsdk_sources - # env: - # - OPENCL_LIB=amdappsdk - # - OPENCL_HEADERS_VER="12" - # - AMDAPPSDK_VERSION=291 # OpenCL 1.2 - # - ENV_CMAKE_OPTIONS="-DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" - # Precise, AMD APP SDK v3.0, OpenCL 2.0, Travis CI container-based infrastructure - - os: linux - sudo: false - compiler: clang - addons: - apt: - packages: *precise_amdappsdk_packages - sources: *precise_amdappsdk_sources - env: - - OPENCL_LIB=amdappsdk - - OPENCL_HEADERS_VER="21" - - AMDAPPSDK_VERSION=300 # OpenCL 2.0 - - ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=200" - - ENV_CMAKE_OPTIONS="-DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" - - os: linux - sudo: false - compiler: gcc - addons: - apt: - packages: *precise_amdappsdk_packages - sources: *precise_amdappsdk_sources - env: - - OPENCL_LIB=amdappsdk - - OPENCL_HEADERS_VER="21" - - AMDAPPSDK_VERSION=300 # OpenCL 2.0 - - ENV_CXX_FLAGS="-DBOOST_COMPUTE_MAX_CL_VERSION=200" - - ENV_CMAKE_OPTIONS="-DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" - - # Coveralls build (-DBOOST_COMPUTE_ENABLE_COVERAGE=ON) # Trusty, AMD APP SDK v2.9.1, OpenCL 1.2 + # CLANG - os: linux dist: trusty sudo: required - compiler: gcc + compiler: clang addons: apt: packages: &trusty_amdappsdk_packages @@ -292,18 +177,31 @@ matrix: sources: &trusty_amdappsdk_sources - ubuntu-toolchain-r-test env: - - LINUX_DIST=trusty - OPENCL_LIB=amdappsdk - - OPENCL_HEADERS_VER="21" + - OPENCL_HEADERS_VER="22" - AMDAPPSDK_VERSION=291 # OpenCL 1.2 - - ENV_CXX_FLAGS="-DBOOST_COMPUTE_MAX_CL_VERSION=102" - - ENV_CMAKE_OPTIONS="-DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include -DBOOST_COMPUTE_ENABLE_COVERAGE=ON -DBOOST_COMPUTE_USE_CPP11=ON" - - COVERAGE=true - - # Latest Boost library builds (currently 1.65.1) - # Precise, AMD APP SDK v2.9.1, Travis CI container-based infrastructure + - ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=102" + - ENV_CMAKE_OPTIONS="-DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" + # GCC - os: linux - sudo: false + dist: trusty + sudo: required + compiler: gcc + addons: + apt: + packages: *trusty_amdappsdk_packages + sources: *trusty_amdappsdk_sources + env: + - OPENCL_LIB=amdappsdk + - OPENCL_HEADERS_VER="22" + - AMDAPPSDK_VERSION=291 # OpenCL 1.2 + - ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=102" + - ENV_CMAKE_OPTIONS="-DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" + # Trusty, AMD APP SDK v3.0.0, OpenCL 2.0 + # CLANG + - os: linux + dist: trusty + sudo: required compiler: clang cache: ccache: true @@ -311,24 +209,26 @@ matrix: - ${DEPS_DIR}/boost addons: apt: - packages: &precise_latest_boost_packages - - g++-4.8 + packages: &trusty_amdappsdk_latest_boost_packages + - g++-5 # Misc - python-yaml - lcov - libopencv-dev - sources: &precise_latest_boost_sources + sources: &trusty_amdappsdk_latest_boost_sources - ubuntu-toolchain-r-test env: - OPENCL_LIB=amdappsdk - - OPENCL_HEADERS_VER="21" - - AMDAPPSDK_VERSION=291 # OpenCL 1.2 + - OPENCL_HEADERS_VER="22" + - AMDAPPSDK_VERSION=300 # OpenCL 2.0 - BOOST_VERSION="1_65_1" # Boost 1.65.1 - - BOOST_URL="http://sourceforge.net/projects/boost/files/boost/1.65.1/boost_1_65_1.tar.gz" - - ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=102" + - BOOST_URL="https://dl.bintray.com/boostorg/release/1.65.1/source/boost_1_65_1.tar.gz" + - ENV_CXX_FLAGS="-DBOOST_COMPUTE_MAX_CL_VERSION=200" - ENV_CMAKE_OPTIONS="-DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include -DBOOST_COMPUTE_USE_CPP11=ON" + # GCC - os: linux - sudo: false + dist: trusty + sudo: required compiler: gcc cache: ccache: true @@ -336,16 +236,18 @@ matrix: - ${DEPS_DIR}/boost addons: apt: - packages: *precise_latest_boost_packages - sources: *precise_latest_boost_sources + packages: *trusty_amdappsdk_latest_boost_packages + sources: *trusty_amdappsdk_latest_boost_sources env: + - GCC_VERSION=5 - OPENCL_LIB=amdappsdk - - OPENCL_HEADERS_VER="21" - - AMDAPPSDK_VERSION=291 # OpenCL 1.2 + - OPENCL_HEADERS_VER="22" + - AMDAPPSDK_VERSION=300 # OpenCL 2.0 - BOOST_VERSION="1_65_1" # Boost 1.65.1 - - BOOST_URL="http://sourceforge.net/projects/boost/files/boost/1.65.1/boost_1_65_1.tar.gz" - - ENV_CXX_FLAGS="-DBOOST_COMPUTE_MAX_CL_VERSION=102" - - ENV_CMAKE_OPTIONS="-DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include -DBOOST_COMPUTE_USE_CPP11=ON" + - BOOST_URL="https://dl.bintray.com/boostorg/release/1.65.1/source/boost_1_65_1.tar.gz" + - ENV_CXX_FLAGS="-DBOOST_COMPUTE_MAX_CL_VERSION=200" + - ENV_CMAKE_OPTIONS="-DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include -DBOOST_COMPUTE_ENABLE_COVERAGE=ON -DBOOST_COMPUTE_USE_CPP11=ON" + - COVERAGE=true ############################################################################ # OSX @@ -361,24 +263,21 @@ matrix: cache: directories: - ${DEPS_DIR}/llvm-${POCL_LLVM_VERSION} + - ${POCL_ROOT} before_install: # Install dependencies - | # POCL dependencies for Trusty - # llvm-toolchain-trusty-3.7 is not whitelisted yet https://github.com/travis-ci/apt-source-whitelist/issues/199 if [[ ${LINUX_DIST} == "trusty" && ${OPENCL_LIB} == "pocl" ]]; then - # see https://github.com/travis-ci/travis-ci/issues/6120 if [ -z "$(ls -A ${DEPS_DIR}/llvm-${POCL_LLVM_VERSION})" ]; then POCL_LLVM_URL=http://llvm.org/releases/${POCL_LLVM_VERSION}/clang+llvm-${POCL_LLVM_VERSION}-x86_64-linux-gnu-ubuntu-14.04.tar.xz mkdir -p ${DEPS_DIR}/llvm-${POCL_LLVM_VERSION} travis_retry wget --no-check-certificate --quiet -O llvm-${POCL_LLVM_VERSION}.tar.xz ${POCL_LLVM_URL} tar xf llvm-${POCL_LLVM_VERSION}.tar.xz -C ${DEPS_DIR}/llvm-${POCL_LLVM_VERSION} --strip-components 1 + else + echo 'Using cached LLVM.' fi - #sudo add-apt-repository -y "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.7 main" - #travis_retry wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | travis_retry sudo apt-key add - - #sudo apt-get update -qq - - #sudo apt-get install -qq -y clang-3.7 libclang-common-3.7-dev libclang-3.7-dev libclang1-3.7 libllvm3.7 lldb-3.7 llvm-3.7 llvm-3.7-dev llvm-3.7-runtime clang-modernize-3.7 clang-format-3.7 lldb-3.7-dev # OSX elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then brew update @@ -388,7 +287,9 @@ before_install: brew install lcov # homebrew/science/opencv fi - gem install coveralls-lcov - - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi + - ${CXX} --version + - if [ "$CXX" = "g++" ]; then export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}"; fi + - ${CXX} --version # Combine global build options with OS/compiler-dependent options - export CMAKE_OPTIONS=${CMAKE_OPTIONS}" "${ENV_CMAKE_OPTIONS} @@ -398,7 +299,7 @@ install: # Download and install recent cmake - | if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then - CMAKE_URL="http://www.cmake.org/files/v3.4/cmake-3.4.3-Linux-x86_64.tar.gz" + CMAKE_URL=${CMAKE_URL} mkdir -p ${DEPS_DIR}/cmake travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C ${DEPS_DIR}/cmake export PATH=${DEPS_DIR}/cmake/bin:${PATH} @@ -416,10 +317,11 @@ install: travis_retry wget --no-check-certificate --quiet -O - ${BOOST_URL} | tar --strip-components=1 -xz -C ${DEPS_DIR}/boost${BOOST_VERSION} pushd ${DEPS_DIR}/boost${BOOST_VERSION} # configure and install - echo "using gcc : 4.8 : g++-4.8 ;" > $HOME/user-config.jam + if [ "$CXX" = "g++-${GCC_VERSION}" ]; then echo "using gcc : ${GCC_VERSION} : g++-${GCC_VERSION} ;" > $HOME/user-config.jam; fi ./bootstrap.sh --prefix=${DEPS_DIR}/boost/ --with-libraries=program_options,filesystem,system,thread,test,timer,chrono ./b2 -d0 install popd + rm -rf ${DEPS_DIR}/boost/include/boost/{compute,compute.hpp} touch ${DEPS_DIR}/boost/${BOOST_VERSION}_cached else echo 'Using cached Boost ${BOOST_VERSION} libraries.' @@ -434,8 +336,8 @@ install: if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then mkdir -p ${OPENCL_ROOT}/include/CL pushd ${OPENCL_ROOT}/include/CL - travis_retry git clone --depth 1 https://github.com/KhronosGroup/OpenCL-Headers.git -b opencl${OPENCL_HEADERS_VER} - mv ./OpenCL-Headers/* . + travis_retry git clone --depth 1 https://github.com/KhronosGroup/OpenCL-Headers.git + mv ./OpenCL-Headers/opencl${OPENCL_HEADERS_VER}/CL/* . travis_retry wget -w 1 -np -nd -nv -A h,hpp --no-check-certificate ${OPENCL_REGISTRY}/api/2.1/cl.hpp; popd fi @@ -445,16 +347,17 @@ install: ############################################################################ - | if [[ ${TRAVIS_OS_NAME} == "linux" && ${OPENCL_LIB} == "pocl" ]]; then - travis_retry git clone --depth 1 https://github.com/pocl/pocl.git -b ${POCL_BRANCH} - cd pocl - if [[ -n "${POCL_COMMIT}" ]]; then - git checkout ${POCL_COMMIT} + if [ -z "$(ls -A ${POCL_ROOT}/)" ]; then + travis_retry git clone --depth 1 https://github.com/pocl/pocl.git -b ${POCL_BRANCH} + cd pocl + mkdir build + cd build + cmake -DDIRECT_LINKAGE=ON -DENABLE_ICD=OFF -DCMAKE_C_COMPILER=${POCL_C_COMPILER} -DCMAKE_CXX_COMPILER=${POCL_CXX_COMPILER} -DWITH_LLVM_CONFIG=${POCL_LLVM_CONFIG} -DCMAKE_INSTALL_PREFIX=${POCL_ROOT}/ .. + make install + cd ../.. + else + echo 'Using cached POCL lib.' fi - mkdir build - cd build - cmake -DDIRECT_LINKAGE=ON -DENABLE_ICD=OFF -DCMAKE_C_COMPILER=${POCL_C_COMPILER} -DCMAKE_CXX_COMPILER=${POCL_CXX_COMPILER} -DWITH_LLVM_CONFIG=${POCL_LLVM_CONFIG} -DCMAKE_INSTALL_PREFIX=${OPENCL_ROOT}/pocl/ .. - make install - cd ../.. fi ############################################################################ @@ -471,7 +374,7 @@ install: mkdir -p inc/CL pushd inc/CL travis_retry git clone --depth 1 https://github.com/KhronosGroup/OpenCL-Headers.git - mv ./OpenCL-Headers/* . + mv ./OpenCL-Headers/opencl${OPENCL_HEADERS_VER}/CL/* . popd mkdir -p lib pushd lib @@ -523,8 +426,7 @@ script: # print OpenCL devices ./example/list_devices # run tests and examples - ctest --output-on-failure - ctest --output-on-failure + ctest --output-on-failure --repeat-until-fail 2 fi after_success: diff --git a/.travis/amd_sdk.sh b/.travis/amd_sdk.sh index cf0267b5..af30d232 100644 --- a/.travis/amd_sdk.sh +++ b/.travis/amd_sdk.sh @@ -3,8 +3,8 @@ # Original script from https://github.com/gregvw/amd_sdk/ # Location from which get nonce and file name from -URL="http://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/" -URLDOWN="http://developer.amd.com/amd-license-agreement-appsdk/" +URL="https://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/" +URLDOWN="https://developer.amd.com/amd-license-agreement-appsdk/" NONCE1_STRING='name="amd_developer_central_downloads_page_nonce"' FILE_STRING='name="f"' diff --git a/test/test_buffer.cpp b/test/test_buffer.cpp index 42488507..e86c41be 100644 --- a/test/test_buffer.cpp +++ b/test/test_buffer.cpp @@ -109,8 +109,8 @@ BOOST_AUTO_TEST_CASE(clone_buffer) BOOST_CHECK(buffer1.get_memory_flags() == buffer2.get_memory_flags()); } -#ifdef BOOST_COMPUTE_USE_CPP11 #ifdef BOOST_COMPUTE_CL_VERSION_1_1 +#ifdef BOOST_COMPUTE_USE_CPP11 std::mutex callback_mutex; std::condition_variable callback_condition_variable;