Merge branch 'develop' into ci-fixes

Zialus · web-flow · commit e9208f5afc40 · 2018-12-28T19:38:31.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ env:
     # OpenCL
     - OPENCL_LIB=default
     # Khronos OpenCL ICD
-    - OPENCL_REGISTRY=https://www.khronos.org/registry/cl
+    - OPENCL_REGISTRY=https://www.khronos.org/registry/OpenCL/
     - OPENCL_ROOT=${DEPS_DIR}/opencl
     # POCL
     - POCL_BRANCH=release_1_2 # branch/tag
@@ -35,7 +35,7 @@ matrix:
     # POCL builds (OpenCL 1.0, 1.1, 1.2)
     ############################################################################
 
-    # Linux, OpenCL 1.0
+    # Xenial, OpenCL 1.0
     # CLANG
     - os: linux
       compiler: clang
@@ -75,7 +75,7 @@ matrix:
        - OPENCL_LIB=pocl
        - 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"
-    # Linux, OpenCL 1.1
+    # Xenial, OpenCL 1.1
     # CLANG
     - os: linux
       compiler: clang
@@ -294,7 +294,9 @@ before_install:
     - eval "${MATRIX_EVAL}"
 
 install:
-    # Download and install recent cmake
+    ############################################################################
+    # Download and install recent CMake    
+    ############################################################################
     - |
       if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
         CMAKE_URL=${CMAKE_URL}
@@ -303,20 +305,22 @@ install:
         export PATH=${DEPS_DIR}/cmake/bin:${PATH}
       fi
 
-    # Download and install Boost
+    ############################################################################
+    # Download and install Boost    
+    ############################################################################
     - |
       if [[ ${TRAVIS_OS_NAME} == "linux" && ${BOOST_VERSION} != "default" ]]; then
         if [ ! -f "${DEPS_DIR}/boost/${BOOST_VERSION}_cached" ]; then
-          # create dirs for source and install
+          # Create dirs for source and install
           mkdir -p ${DEPS_DIR}/boost${BOOST_VERSION}
           mkdir -p ${DEPS_DIR}/boost
           rm -rf ${DEPS_DIR}/boost/*
-          # download
+          # Download
           BOOST_BASENAME=$(echo ${BOOST_VERSION} | awk -F '_' '{print $1 "." $2 "." $3 }')
           BOOST_URL="https://dl.bintray.com/boostorg/release/${BOOST_BASENAME}/source/boost_${BOOST_VERSION}.tar.gz"
           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
+          # Configure and install
           ./bootstrap.sh --prefix=${DEPS_DIR}/boost/ --with-libraries=program_options,filesystem,system,thread,test,timer,chrono
           ./b2 -d0 install
           popd
@@ -382,15 +386,15 @@ script:
     - echo ${CMAKE_OPTIONS}
     - echo ${CXX_FLAGS}
     - if [[ ${TRAVIS_OS_NAME} != "windows" ]]; then cmake -G"${GENERATOR}" ${CMAKE_OPTIONS} -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" .. ; fi
-    - if [[ ${TRAVIS_OS_NAME} == "windows" ]]; then cmake -G"${GENERATOR} -DBOOST_COMPUTE_BUILD_TESTS=ON -DBOOST_COMPUTE_BUILD_EXAMPLES=ON -DCMAKE_CXX_FLAGS="${CXX_FLAGS}".. ; fi
+    - if [[ ${TRAVIS_OS_NAME} == "windows" ]]; then cmake -G"${GENERATOR}" -DBOOST_COMPUTE_BUILD_TESTS=ON -DBOOST_COMPUTE_BUILD_EXAMPLES=ON -DCMAKE_CXX_FLAGS="${CXX_FLAGS}".. ; fi
     # https://stackoverflow.com/questions/39865367/warning-section-textcoal-nt-is-deprecate-since-updating-to-mac-osx-sierra
     - if [[ ${TRAVIS_OS_NAME} == "osx" ]]; then cmake --build . -j 4 --config Debug 2>&1 | grep -v -e '^/var/folders/*' -e '^[[:space:]]*\.section' -e '^[[:space:]]*\^[[:space:]]*~*' ; fi
     - if [[ ${TRAVIS_OS_NAME} != "osx" ]]; then cmake --build . -j 4 --config Debug ; fi
     - |
       if [[ ${RUN_TESTS} == "true" ]]; then
-        # print OpenCL devices
+        # Print OpenCL devices
         ./example/list_devices
-        # run tests and examples
+        # Run tests and examples
         ctest --output-on-failure --repeat-until-fail 2
       fi
 
diff --git a/doc/platforms_and_compilers.qbk b/doc/platforms_and_compilers.qbk
@@ -40,6 +40,7 @@ To explicitly enable variadic support for Boost.Preprocessor add
 * POCL (CPUs only)
 * Beignet (Intel GPUs only)
 * Apple (CPUs and GPUs)
+* Xilinx (FPGA)
 
 [endsect]
 
diff --git a/example/simple_moving_average.cpp b/example/simple_moving_average.cpp
@@ -60,7 +60,7 @@ bool check_results(const std::vector<float>& values, const std::vector<float>& s
 
     int semiWidth = wSize/2;
 
-    bool res = true;
+    bool ret = true;
     for(int idx = 0 ; idx < size ; ++idx)
     {
         int start = (std::max)(idx - semiWidth,0);
@@ -76,11 +76,11 @@ bool check_results(const std::vector<float>& values, const std::vector<float>& s
         if(std::abs(res-smoothValues[idx]) > 1e-3)
         {
             std::cout << "idx = " << idx << " -- expected = " << res << " -- result = " << smoothValues[idx] << std::endl;
-            res = false;
+            ret = false;
         }
     }
 
-    return res;
+    return ret;
 }
 
 // generate a uniform law over [0,10]
diff --git a/include/boost/compute/algorithm/detail/merge_sort_on_gpu.hpp b/include/boost/compute/algorithm/detail/merge_sort_on_gpu.hpp
@@ -170,8 +170,12 @@ inline size_t bitonic_block_sort(KeyIterator keys_first,
             k.decl<bool>("compare") << " = " <<
                 compare(k.var<key_type>("sibling_key"),
                         k.var<key_type>("my_key")) << ";\n" <<
+            k.decl<bool>("equal") << " = !(compare || " <<
+                compare(k.var<key_type>("my_key"),
+                        k.var<key_type>("sibling_key")) << ");\n" <<
             k.decl<bool>("swap") <<
                 " = compare ^ (sibling_idx < lid) ^ direction;\n" <<
+            "swap = equal ? false : swap;\n" <<
             "my_key = swap ? sibling_key : my_key;\n";
     if(sort_by_key)
     {
@@ -220,8 +224,12 @@ inline size_t bitonic_block_sort(KeyIterator keys_first,
             k.decl<bool>("compare") << " = " <<
                 compare(k.var<key_type>("sibling_key"),
                         k.var<key_type>("my_key")) << ";\n" <<
+            k.decl<bool>("equal") << " = !(compare || " <<
+                compare(k.var<key_type>("my_key"),
+                        k.var<key_type>("sibling_key")) << ");\n" <<
             k.decl<bool>("swap") <<
                 " = compare ^ (sibling_idx < lid);\n" <<
+            "swap = equal ? false : swap;\n" <<
             "my_key = swap ? sibling_key : my_key;\n";
     if(sort_by_key)
     {
diff --git a/include/boost/compute/cl.hpp b/include/boost/compute/cl.hpp
@@ -11,23 +11,7 @@
 #ifndef BOOST_COMPUTE_CL_HPP
 #define BOOST_COMPUTE_CL_HPP
 
-#if defined(BOOST_COMPUTE_MAX_CL_VERSION)
-#  if !defined(CL_USE_DEPRECATED_OPENCL_2_1_APIS) && BOOST_COMPUTE_MAX_CL_VERSION < 202
-#    define CL_USE_DEPRECATED_OPENCL_2_1_APIS
-#  endif
-#  if !defined(CL_USE_DEPRECATED_OPENCL_2_0_APIS) && BOOST_COMPUTE_MAX_CL_VERSION < 201
-#    define CL_USE_DEPRECATED_OPENCL_2_0_APIS
-#  endif
-#  if !defined(CL_USE_DEPRECATED_OPENCL_1_2_APIS) && BOOST_COMPUTE_MAX_CL_VERSION < 200
-#    define CL_USE_DEPRECATED_OPENCL_1_2_APIS
-#  endif
-#  if !defined(CL_USE_DEPRECATED_OPENCL_1_1_APIS) && BOOST_COMPUTE_MAX_CL_VERSION < 102
-#    define CL_USE_DEPRECATED_OPENCL_1_1_APIS
-#  endif
-#  if !defined(CL_USE_DEPRECATED_OPENCL_1_0_APIS) && BOOST_COMPUTE_MAX_CL_VERSION < 101
-#    define CL_USE_DEPRECATED_OPENCL_1_0_APIS
-#  endif
-#endif
+#include <boost/compute/detail/cl_versions.hpp>
 
 #if defined(__APPLE__)
 #include <OpenCL/cl.h>
diff --git a/include/boost/compute/cl_ext.hpp b/include/boost/compute/cl_ext.hpp
@@ -11,23 +11,7 @@
 #ifndef BOOST_COMPUTE_CL_EXT_HPP
 #define BOOST_COMPUTE_CL_EXT_HPP
 
-#if defined(BOOST_COMPUTE_MAX_CL_VERSION)
-#  if !defined(CL_USE_DEPRECATED_OPENCL_2_1_APIS) && BOOST_COMPUTE_MAX_CL_VERSION < 202
-#    define CL_USE_DEPRECATED_OPENCL_2_1_APIS
-#  endif
-#  if !defined(CL_USE_DEPRECATED_OPENCL_2_0_APIS) && BOOST_COMPUTE_MAX_CL_VERSION < 201
-#    define CL_USE_DEPRECATED_OPENCL_2_0_APIS
-#  endif
-#  if !defined(CL_USE_DEPRECATED_OPENCL_1_2_APIS) && BOOST_COMPUTE_MAX_CL_VERSION < 200
-#    define CL_USE_DEPRECATED_OPENCL_1_2_APIS
-#  endif
-#  if !defined(CL_USE_DEPRECATED_OPENCL_1_1_APIS) && BOOST_COMPUTE_MAX_CL_VERSION < 102
-#    define CL_USE_DEPRECATED_OPENCL_1_1_APIS
-#  endif
-#  if !defined(CL_USE_DEPRECATED_OPENCL_1_0_APIS) && BOOST_COMPUTE_MAX_CL_VERSION < 101
-#    define CL_USE_DEPRECATED_OPENCL_1_0_APIS
-#  endif
-#endif
+#include "detail/cl_versions.hpp"
 
 #if defined(__APPLE__)
 #include <OpenCL/cl_ext.h>
diff --git a/include/boost/compute/detail/cl_versions.hpp b/include/boost/compute/detail/cl_versions.hpp
@@ -0,0 +1,64 @@
+//---------------------------------------------------------------------------//
+// Copyright (c) 2018 Jakub Szuppe <j.szuppe@gmail.com>
+//
+// Distributed under the Boost Software License, Version 1.0
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+//
+// See http://boostorg.github.com/compute for more information.
+//---------------------------------------------------------------------------//
+
+#ifndef BOOST_COMPUTE_DETAIL_CL_VERSION_HPP
+#define BOOST_COMPUTE_DETAIL_CL_VERSION_HPP
+
+#if defined(BOOST_COMPUTE_MAX_CL_VERSION)
+#  if !defined(CL_USE_DEPRECATED_OPENCL_2_1_APIS) && BOOST_COMPUTE_MAX_CL_VERSION < 202
+#    define CL_USE_DEPRECATED_OPENCL_2_1_APIS
+#  endif
+#  if !defined(CL_USE_DEPRECATED_OPENCL_2_0_APIS) && BOOST_COMPUTE_MAX_CL_VERSION < 201
+#    define CL_USE_DEPRECATED_OPENCL_2_0_APIS
+#  endif
+#  if !defined(CL_USE_DEPRECATED_OPENCL_1_2_APIS) && BOOST_COMPUTE_MAX_CL_VERSION < 200
+#    define CL_USE_DEPRECATED_OPENCL_1_2_APIS
+#  endif
+#  if !defined(CL_USE_DEPRECATED_OPENCL_1_1_APIS) && BOOST_COMPUTE_MAX_CL_VERSION < 102
+#    define CL_USE_DEPRECATED_OPENCL_1_1_APIS
+#  endif
+#  if !defined(CL_USE_DEPRECATED_OPENCL_1_0_APIS) && BOOST_COMPUTE_MAX_CL_VERSION < 101
+#    define CL_USE_DEPRECATED_OPENCL_1_0_APIS
+#  endif
+#endif
+
+#if defined(BOOST_COMPUTE_MAX_CL_VERSION) && !defined(CL_TARGET_OPENCL_VERSION)
+#  if BOOST_COMPUTE_MAX_CL_VERSION == 201
+#    define CL_TARGET_OPENCL_VERSION 210
+#  elif BOOST_COMPUTE_MAX_CL_VERSION == 200
+#    define CL_TARGET_OPENCL_VERSION 200
+#  elif BOOST_COMPUTE_MAX_CL_VERSION == 102
+#    define CL_TARGET_OPENCL_VERSION 120
+#  elif BOOST_COMPUTE_MAX_CL_VERSION == 101
+#    define CL_TARGET_OPENCL_VERSION 110
+#  elif BOOST_COMPUTE_MAX_CL_VERSION == 100
+#    define CL_TARGET_OPENCL_VERSION 100
+#  else 
+#    define CL_TARGET_OPENCL_VERSION 220
+#  endif 
+#endif 
+
+#if defined(BOOST_COMPUTE_MAX_CL_VERSION) && defined(CL_TARGET_OPENCL_VERSION)
+#  if BOOST_COMPUTE_MAX_CL_VERSION == 202 && CL_TARGET_OPENCL_VERSION != 220
+#    error "Boost.Compute: CL_TARGET_OPENCL_VERSION definition does not match BOOST_COMPUTE_MAX_CL_VERSION"
+#  elif BOOST_COMPUTE_MAX_CL_VERSION == 201 && CL_TARGET_OPENCL_VERSION != 210
+#    error "Boost.Compute: CL_TARGET_OPENCL_VERSION definition does not match BOOST_COMPUTE_MAX_CL_VERSION"
+#  elif BOOST_COMPUTE_MAX_CL_VERSION == 200 && CL_TARGET_OPENCL_VERSION != 200
+#    error "Boost.Compute: CL_TARGET_OPENCL_VERSION definition does not match BOOST_COMPUTE_MAX_CL_VERSION"
+#  elif BOOST_COMPUTE_MAX_CL_VERSION == 102 && CL_TARGET_OPENCL_VERSION != 120
+#    error "Boost.Compute: CL_TARGET_OPENCL_VERSION definition does not match BOOST_COMPUTE_MAX_CL_VERSION"
+#  elif BOOST_COMPUTE_MAX_CL_VERSION == 101 && CL_TARGET_OPENCL_VERSION != 110
+#    error "Boost.Compute: CL_TARGET_OPENCL_VERSION definition does not match BOOST_COMPUTE_MAX_CL_VERSION"
+#  elif BOOST_COMPUTE_MAX_CL_VERSION == 100 && CL_TARGET_OPENCL_VERSION != 100
+#    error "Boost.Compute: CL_TARGET_OPENCL_VERSION definition does not match BOOST_COMPUTE_MAX_CL_VERSION"
+#  endif 
+#endif 
+
+#endif // BOOST_COMPUTE_DETAIL_CL_VERSION_HPP
diff --git a/include/boost/compute/detail/nvidia_compute_capability.hpp b/include/boost/compute/detail/nvidia_compute_capability.hpp
@@ -13,7 +13,8 @@
 
 #include <boost/compute/device.hpp>
 
-#ifdef BOOST_COMPUTE_HAVE_HDR_CL_EXT
+#ifdef BOOST_COMPUTE_HAVE_HDR_CL_EXT    
+  #include <boost/compute/detail/cl_versions.hpp>
   #include <CL/cl_ext.h>
 #endif
 
diff --git a/include/boost/compute/interop/opengl/cl_gl.hpp b/include/boost/compute/interop/opengl/cl_gl.hpp
@@ -11,6 +11,8 @@
 #ifndef BOOST_COMPUTE_INTEROP_OPENGL_CL_GL_HPP
 #define BOOST_COMPUTE_INTEROP_OPENGL_CL_GL_HPP
 
+#include <boost/compute/detail/cl_versions.hpp>
+
 #if defined(__APPLE__)
 #include <OpenCL/cl_gl.h>
 #else
diff --git a/include/boost/compute/interop/opengl/cl_gl_ext.hpp b/include/boost/compute/interop/opengl/cl_gl_ext.hpp
@@ -11,23 +11,7 @@
 #ifndef BOOST_COMPUTE_INTEROP_OPENGL_CL_GL_EXT_HPP
 #define BOOST_COMPUTE_INTEROP_OPENGL_CL_GL_EXT_HPP
 
-#if defined(BOOST_COMPUTE_MAX_CL_VERSION)
-#  if !defined(CL_USE_DEPRECATED_OPENCL_2_1_APIS) && BOOST_COMPUTE_MAX_CL_VERSION < 202
-#    define CL_USE_DEPRECATED_OPENCL_2_1_APIS
-#  endif
-#  if !defined(CL_USE_DEPRECATED_OPENCL_2_0_APIS) && BOOST_COMPUTE_MAX_CL_VERSION < 201
-#    define CL_USE_DEPRECATED_OPENCL_2_0_APIS
-#  endif
-#  if !defined(CL_USE_DEPRECATED_OPENCL_1_2_APIS) && BOOST_COMPUTE_MAX_CL_VERSION < 200
-#    define CL_USE_DEPRECATED_OPENCL_1_2_APIS
-#  endif
-#  if !defined(CL_USE_DEPRECATED_OPENCL_1_1_APIS) && BOOST_COMPUTE_MAX_CL_VERSION < 102
-#    define CL_USE_DEPRECATED_OPENCL_1_1_APIS
-#  endif
-#  if !defined(CL_USE_DEPRECATED_OPENCL_1_0_APIS) && BOOST_COMPUTE_MAX_CL_VERSION < 101
-#    define CL_USE_DEPRECATED_OPENCL_1_0_APIS
-#  endif
-#endif
+#include <boost/compute/detail/cl_versions.hpp>
 
 #if defined(__APPLE__)
 #include <OpenCL/cl_gl_ext.h>
diff --git a/test/test_sort.cpp b/test/test_sort.cpp
@@ -340,6 +340,7 @@ BOOST_AUTO_TEST_CASE(sort_int2)
     host[size/4] = int2_(20.f, 0.f);
     host[(size*3)/4] = int2_(9.f, 0.f);
     host[size-3] = int2_(-10.0f, 0.f);
+    host[size/2+1] = int2_(-10.0f, -1.f);
 
     boost::compute::vector<int2_> vector(size, context);
     boost::compute::copy(host.begin(), host.end(), vector.begin(), queue);
@@ -356,9 +357,11 @@ BOOST_AUTO_TEST_CASE(sort_int2)
     );
     boost::compute::copy(vector.begin(), vector.end(), host.begin(), queue);
     BOOST_CHECK_CLOSE(host[0][0], -10.f, 0.1);
+    BOOST_CHECK_CLOSE(host[1][0], -10.f, 0.1);
     BOOST_CHECK_CLOSE(host[(size - 3)][0], 9.f, 0.1);
     BOOST_CHECK_CLOSE(host[(size - 2)][0], 20.f, 0.1);
     BOOST_CHECK_CLOSE(host[(size - 1)][0], 100.f, 0.1);
+    BOOST_CHECK_NE(host[0], host[1]);
 }
 
 BOOST_AUTO_TEST_SUITE_END()

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ bool check_results(const std::vector<float>& values, const std::vector<float>& s`
`60`	`60`
`61`	`61`	`int semiWidth = wSize/2;`
`62`	`62`
`63`		`- bool res = true;`
	`63`	`+ bool ret = true;`
`64`	`64`	`for(int idx = 0 ; idx < size ; ++idx)`
`65`	`65`	`{`
`66`	`66`	`int start = (std::max)(idx - semiWidth,0);`
`@@ -76,11 +76,11 @@ bool check_results(const std::vector<float>& values, const std::vector<float>& s`
`76`	`76`	`if(std::abs(res-smoothValues[idx]) > 1e-3)`
`77`	`77`	`{`
`78`	`78`	`std::cout << "idx = " << idx << " -- expected = " << res << " -- result = " << smoothValues[idx] << std::endl;`
`79`		`- res = false;`
	`79`	`+ ret = false;`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`
`83`		`- return res;`
	`83`	`+ return ret;`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`// generate a uniform law over [0,10]`