diff --git a/doc/overview/gpu.qbk b/doc/overview/gpu.qbk index 7fb27e645e..58df868a63 100644 --- a/doc/overview/gpu.qbk +++ b/doc/overview/gpu.qbk @@ -54,6 +54,9 @@ And lastly on SYCL: }); } +When using SYCL you must define BOOST_MATH_ENABLE_SYCL, since device support is opt-in on that platform. +For NVCC and NVRTC device support is enabled automatically. + Once your kernel function has been written then use the framework mechanism for launching the kernel. [endsect] [/section:gpu Support for GPU programming in Boost.Math] diff --git a/include/boost/math/tools/config.hpp b/include/boost/math/tools/config.hpp index 964a2bf0bb..df0059873d 100644 --- a/include/boost/math/tools/config.hpp +++ b/include/boost/math/tools/config.hpp @@ -702,15 +702,11 @@ namespace boost{ namespace math{ # undef BOOST_MATH_FORCEINLINE # define BOOST_MATH_FORCEINLINE __forceinline__ -#elif defined(SYCL_LANGUAGE_VERSION) +#elif defined(BOOST_MATH_ENABLE_SYCL) # define BOOST_MATH_SYCL_ENABLED SYCL_EXTERNAL # define BOOST_MATH_HAS_GPU_SUPPORT -# ifndef BOOST_MATH_ENABLE_SYCL -# define BOOST_MATH_ENABLE_SYCL -# endif - # ifndef BOOST_MATH_NO_EXCEPTIONS # define BOOST_MATH_NO_EXCEPTIONS # endif diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a0f4b3cdee..2d91450439 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -43,7 +43,7 @@ if(HAVE_BOOST_TEST) enable_testing() - boost_test_jamfile(FILE sycl_jamfile LINK_LIBRARIES Boost::math Boost::assert Boost::concept_check Boost::config Boost::core Boost::integer Boost::lexical_cast Boost::multiprecision Boost::predef Boost::random Boost::static_assert Boost::throw_exception Boost::unit_test_framework sycl COMPILE_OPTIONS -fsycl ) + boost_test_jamfile(FILE sycl_jamfile LINK_LIBRARIES Boost::math Boost::assert Boost::concept_check Boost::config Boost::core Boost::integer Boost::lexical_cast Boost::multiprecision Boost::predef Boost::random Boost::static_assert Boost::throw_exception Boost::unit_test_framework sycl COMPILE_DEFINITIONS BOOST_MATH_ENABLE_SYCL=1 COMPILE_OPTIONS -fsycl ) else() boost_test(SOURCES check_cmake_version.cpp ARGUMENTS ${PROJECT_VERSION} LINK_LIBRARIES Boost::core Boost::config) diff --git a/test/gegenbauer_test.cpp b/test/gegenbauer_test.cpp index 8e779acf79..69dc6b97a4 100644 --- a/test/gegenbauer_test.cpp +++ b/test/gegenbauer_test.cpp @@ -5,7 +5,7 @@ * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/pow_test.cpp b/test/pow_test.cpp index 8a5ae0c109..52e86b0844 100644 --- a/test/pow_test.cpp +++ b/test/pow_test.cpp @@ -15,7 +15,7 @@ #include "../include_private/boost/math/tools/test.hpp" #define BOOST_TEST_MAIN -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_airy.cpp b/test/test_airy.cpp index 224c590094..f5f0900c45 100644 --- a/test/test_airy.cpp +++ b/test/test_airy.cpp @@ -3,7 +3,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #else #include "sycl/sycl.hpp" @@ -60,7 +60,7 @@ void test_airy(T, const char* name) if (boost::math::tools::digits() > 100) tol *= 2; - #ifdef SYCL_LANGUAGE_VERSION + #ifdef BOOST_MATH_ENABLE_SYCL tol *= 5; #endif diff --git a/test/test_arcsine.cpp b/test/test_arcsine.cpp index 1ad7d8c0d0..eed8dc9481 100644 --- a/test/test_arcsine.cpp +++ b/test/test_arcsine.cpp @@ -10,7 +10,7 @@ // Tests for the arcsine Distribution. -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include // Must be 1st include, and include_directory /libs/math/src/tr1/ is needed. #else #include "sycl/sycl.hpp" diff --git a/test/test_bernoulli.cpp b/test/test_bernoulli.cpp index 59868e2f0e..5f78b0afc5 100644 --- a/test/test_bernoulli.cpp +++ b/test/test_bernoulli.cpp @@ -18,7 +18,7 @@ # pragma warning (disable : 4127) // conditional expression is constant. #endif -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_bessel_i.cpp b/test/test_bessel_i.cpp index 56e7669ffb..10641848dc 100644 --- a/test/test_bessel_i.cpp +++ b/test/test_bessel_i.cpp @@ -3,7 +3,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #else #define BOOST_MATH_PROMOTE_DOUBLE_POLICY false @@ -97,7 +97,7 @@ void expected_results() "linux", // platform largest_type, // test type(s) ".*Random.*", // test data group - #ifdef SYCL_LANGUAGE_VERSION + #ifdef BOOST_MATH_ENABLE_SYCL ".*", 600, 200); #else ".*", 400, 200); // test function @@ -130,7 +130,7 @@ void expected_results() ".*", // platform largest_type, // test type(s) ".*", // test data group - #ifdef SYCL_LANGUAGE_VERSION + #ifdef BOOST_MATH_ENABLE_SYCL ".*", 400, 200); #else ".*", 20, 10); // test function diff --git a/test/test_bessel_i.hpp b/test/test_bessel_i.hpp index ca021fa8c5..ee19e16ed2 100644 --- a/test/test_bessel_i.hpp +++ b/test/test_bessel_i.hpp @@ -201,7 +201,7 @@ void test_bessel(T, const char* name) } } T tolerance = boost::math::tools::epsilon() * 100; -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL if ((boost::math::tools::digits() <= std::numeric_limits::digits) && (std::numeric_limits::max_exponent > 1000)) { BOOST_CHECK_CLOSE_FRACTION(boost::math::cyl_bessel_i(T(0.5), T(710)), SC_(3.3447452278080108123142599104927325061327359278058601201179e306), tolerance); diff --git a/test/test_bessel_j.cpp b/test/test_bessel_j.cpp index e681a694ee..2570c3e092 100644 --- a/test/test_bessel_j.cpp +++ b/test/test_bessel_j.cpp @@ -3,7 +3,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #else #define BOOST_MATH_PROMOTE_DOUBLE_POLICY false diff --git a/test/test_bessel_j.hpp b/test/test_bessel_j.hpp index 2f68bc1149..33c150df48 100644 --- a/test/test_bessel_j.hpp +++ b/test/test_bessel_j.hpp @@ -284,7 +284,7 @@ void test_bessel(T, const char* name) BOOST_MATH_CHECK_THROW(boost::math::sph_bessel(2, T(-2.0)), std::domain_error); BOOST_CHECK_EQUAL(boost::math::cyl_bessel_j(T(0), T(2.5)), boost::math::cyl_bessel_j(T(0), T(-2.5))); BOOST_CHECK_EQUAL(boost::math::cyl_bessel_j(T(1), T(2.5)), -boost::math::cyl_bessel_j(T(1), T(-2.5))); - #ifndef SYCL_LANGUAGE_VERSION + #ifndef BOOST_MATH_ENABLE_SYCL BOOST_CHECK_CLOSE_FRACTION(boost::math::cyl_bessel_j(364, T(38.5)), SC_(1.793940496519190500748409872348034004417458734118663909894e-309), tolerance); #endif // diff --git a/test/test_bessel_k.cpp b/test/test_bessel_k.cpp index 0f32078665..6053114585 100644 --- a/test/test_bessel_k.cpp +++ b/test/test_bessel_k.cpp @@ -5,7 +5,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #else #define BOOST_MATH_PROMOTE_DOUBLE_POLICY false diff --git a/test/test_bessel_k.hpp b/test/test_bessel_k.hpp index 36b86bec5e..4752aa6811 100644 --- a/test/test_bessel_k.hpp +++ b/test/test_bessel_k.hpp @@ -176,7 +176,7 @@ void test_bessel(T, const char* name) // // Extra test coverage: // - #ifndef SYCL_LANGUAGE_VERSION // SYCL doesn't throw + #ifndef BOOST_MATH_ENABLE_SYCL // SYCL doesn't throw BOOST_CHECK_THROW(boost::math::cyl_bessel_k(T(2), T(-1)), std::domain_error); BOOST_CHECK_THROW(boost::math::cyl_bessel_k(T(2.2), T(-1)), std::domain_error); BOOST_IF_CONSTEXPR(std::numeric_limits::has_infinity) diff --git a/test/test_bessel_y.cpp b/test/test_bessel_y.cpp index 3b90d20bd2..05d85b83bc 100644 --- a/test/test_bessel_y.cpp +++ b/test/test_bessel_y.cpp @@ -3,7 +3,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #else #define BOOST_MATH_PROMOTE_DOUBLE_POLICY false @@ -248,7 +248,7 @@ void expected_results() ".*", // platform largest_type, // test type(s) ".*(Y[nv]|y).*Random.*", // test data group - #ifdef SYCL_LANGUAGE_VERSION + #ifdef BOOST_MATH_ENABLE_SYCL ".*", 2000, 1000); #else ".*", 1500, 1000); // test function diff --git a/test/test_beta.cpp b/test/test_beta.cpp index cba16023cc..ce56360a13 100644 --- a/test/test_beta.cpp +++ b/test/test_beta.cpp @@ -5,7 +5,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #else #include "sycl/sycl.hpp" diff --git a/test/test_beta_dist.cpp b/test/test_beta_dist.cpp index e139ef4f63..d989197b6b 100644 --- a/test/test_beta_dist.cpp +++ b/test/test_beta_dist.cpp @@ -32,7 +32,7 @@ # pragma warning (disable : 4224) // nonstandard extension used : formal parameter 'arg' was previously defined as a type. #endif -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_beta_simple.cpp b/test/test_beta_simple.cpp index 3bd7095741..b864047c35 100644 --- a/test/test_beta_simple.cpp +++ b/test/test_beta_simple.cpp @@ -8,7 +8,7 @@ #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error #define BOOST_MATH_PROMOTE_DOUBLE_POLICY false -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_cauchy.cpp b/test/test_cauchy.cpp index 9f4c4bb8e6..8136999e37 100644 --- a/test/test_cauchy.cpp +++ b/test/test_cauchy.cpp @@ -16,7 +16,7 @@ # pragma warning(disable: 4127) // conditional expression is constant #endif -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #define BOOST_MATH_PROMOTE_DOUBLE_POLICY false #include "sycl/sycl.hpp" #include @@ -137,7 +137,7 @@ void test_spots(RealType T) static_cast(0.000000021220659078919346664504384865488560725L), tolerance); // % - #ifndef SYCL_LANGUAGE_VERSION // Returns infinity + #ifndef BOOST_MATH_ENABLE_SYCL // Returns infinity BOOST_CHECK_CLOSE( // Test the CDF at -max_value()/4. // For an input x of this magnitude, the reference value is 4/|x|/pi. @@ -220,7 +220,7 @@ void test_spots(RealType T) static_cast(0.000000021220659078919346664504384865488560725L), tolerance); // % - #ifndef SYCL_LANGUAGE_VERSION // Returns infinity + #ifndef BOOST_MATH_ENABLE_SYCL // Returns infinity BOOST_CHECK_CLOSE( // Test the complemented CDF at max_value()/4. // For an input x of this magnitude, the reference value is 4/x/pi. diff --git a/test/test_cbrt.cpp b/test/test_cbrt.cpp index 2f80534167..3b662f909a 100644 --- a/test/test_cbrt.cpp +++ b/test/test_cbrt.cpp @@ -9,7 +9,7 @@ # pragma warning (disable : 4224) #endif -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include // include /libs/math/src/ #else #include "sycl/sycl.hpp" diff --git a/test/test_chi_squared.cpp b/test/test_chi_squared.cpp index 8580049d7f..a64926ca58 100644 --- a/test/test_chi_squared.cpp +++ b/test/test_chi_squared.cpp @@ -16,7 +16,7 @@ # pragma warning(disable: 4127) // conditional expression is constant #endif -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_digamma_simple.cpp b/test/test_digamma_simple.cpp index 72a68a38a8..30aeb29e4b 100644 --- a/test/test_digamma_simple.cpp +++ b/test/test_digamma_simple.cpp @@ -4,7 +4,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_ellint_1.cpp b/test/test_ellint_1.cpp index 213ac26043..7e4f1bf4d8 100644 --- a/test/test_ellint_1.cpp +++ b/test/test_ellint_1.cpp @@ -6,7 +6,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include // include /libs/math/src/ #else #include "sycl/sycl.hpp" diff --git a/test/test_ellint_2.cpp b/test/test_ellint_2.cpp index fe50474cc6..77c3007452 100644 --- a/test/test_ellint_2.cpp +++ b/test/test_ellint_2.cpp @@ -6,7 +6,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include // include /libs/math/src/ #else #include "sycl/sycl.hpp" @@ -77,7 +77,7 @@ void expected_results() ".*", // platform largest_type, // test type(s) ".*", // test data group - #ifdef SYCL_LANGUAGE_VERSION + #ifdef BOOST_MATH_ENABLE_SYCL ".*", 20, 6); // test function #else ".*", 15, 6); // test function diff --git a/test/test_ellint_d.cpp b/test/test_ellint_d.cpp index 46619eafd8..adfd0b0509 100644 --- a/test/test_ellint_d.cpp +++ b/test/test_ellint_d.cpp @@ -6,7 +6,7 @@ #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include // include /libs/math/src/ #else #include "sycl/sycl.hpp" diff --git a/test/test_erf.cpp b/test/test_erf.cpp index a0808449b5..cb5d476110 100644 --- a/test/test_erf.cpp +++ b/test/test_erf.cpp @@ -4,7 +4,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #else #include "sycl/sycl.hpp" diff --git a/test/test_expint.cpp b/test/test_expint.cpp index d184f65da1..8dec9d2cba 100644 --- a/test/test_expint.cpp +++ b/test/test_expint.cpp @@ -3,7 +3,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #else #include "sycl/sycl.hpp" @@ -87,7 +87,7 @@ void expected_results() ".*", // platform "float|double|long double", // test type(s) ".*Ei.*", // test data group -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL ".*", 6, 3); // test function #else ".*", 10, 3); diff --git a/test/test_expm1_simple.cpp b/test/test_expm1_simple.cpp index 573b1841b5..22b88a22cb 100644 --- a/test/test_expm1_simple.cpp +++ b/test/test_expm1_simple.cpp @@ -3,7 +3,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_exponential_dist.cpp b/test/test_exponential_dist.cpp index cbea912dc8..124e2929ad 100644 --- a/test/test_exponential_dist.cpp +++ b/test/test_exponential_dist.cpp @@ -8,7 +8,7 @@ // test_exponential_dist.cpp -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_extreme_value.cpp b/test/test_extreme_value.cpp index 6c9ce6cba3..255777914f 100644 --- a/test/test_extreme_value.cpp +++ b/test/test_extreme_value.cpp @@ -7,7 +7,7 @@ // test_extreme_value.cpp -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_fisher_f.cpp b/test/test_fisher_f.cpp index d2a2de775e..0739dfbda2 100644 --- a/test/test_fisher_f.cpp +++ b/test/test_fisher_f.cpp @@ -8,7 +8,7 @@ // (See accompanying file LICENSE_1_0.txt // or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_gamma.cpp b/test/test_gamma.cpp index 0a12017911..5608944f24 100644 --- a/test/test_gamma.cpp +++ b/test/test_gamma.cpp @@ -3,7 +3,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #else #include "sycl/sycl.hpp" diff --git a/test/test_gamma_dist.cpp b/test/test_gamma_dist.cpp index 8b68b7cab8..f1abbfd995 100644 --- a/test/test_gamma_dist.cpp +++ b/test/test_gamma_dist.cpp @@ -15,7 +15,7 @@ // From MathWorld--A Wolfram Web Resource. // http://mathworld.wolfram.com/GammaDistribution.html -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include // include directory libs/math/src/tr1/ is needed. #else #include "sycl/sycl.hpp" diff --git a/test/test_geometric.cpp b/test/test_geometric.cpp index 2740117cf6..7e1a00f574 100644 --- a/test/test_geometric.cpp +++ b/test/test_geometric.cpp @@ -19,7 +19,7 @@ # pragma warning(disable: 4127) // conditional expression is constant. #endif -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_hankel.cpp b/test/test_hankel.cpp index bc74f83fed..edaa9c122b 100644 --- a/test/test_hankel.cpp +++ b/test/test_hankel.cpp @@ -3,7 +3,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #else #include "sycl/sycl.hpp" @@ -103,7 +103,7 @@ void test_hankel(T, const char* name) // // Instantiate a few instances to check our error handling code can cope with std::complex: // -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL typedef boost::math::policies::policy< boost::math::policies::overflow_error, boost::math::policies::denorm_error, diff --git a/test/test_hermite.cpp b/test/test_hermite.cpp index 60dafdb8f1..2e589e6453 100644 --- a/test/test_hermite.cpp +++ b/test/test_hermite.cpp @@ -5,7 +5,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #endif diff --git a/test/test_heuman_lambda.cpp b/test/test_heuman_lambda.cpp index dc44391822..95c88bcd83 100644 --- a/test/test_heuman_lambda.cpp +++ b/test/test_heuman_lambda.cpp @@ -4,7 +4,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include // include /libs/math/src/ #else #include "sycl/sycl.hpp" diff --git a/test/test_holtsmark.cpp b/test/test_holtsmark.cpp index 8ec21a3065..75cf8a232c 100644 --- a/test/test_holtsmark.cpp +++ b/test/test_holtsmark.cpp @@ -7,7 +7,7 @@ #define BOOST_TEST_MAIN #define BOOST_TEST_MODULE StatsHoltsmarkTest -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_ibeta.cpp b/test/test_ibeta.cpp index c5b2bdb850..563844a06c 100644 --- a/test/test_ibeta.cpp +++ b/test/test_ibeta.cpp @@ -3,7 +3,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #else #define BOOST_MATH_PROMOTE_DOUBLE_POLICY false diff --git a/test/test_ibeta_inv.cpp b/test/test_ibeta_inv.cpp index 868efa7ed2..63a24e8db7 100644 --- a/test/test_ibeta_inv.cpp +++ b/test/test_ibeta_inv.cpp @@ -3,7 +3,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #else #define BOOST_MATH_PROMOTE_DOUBLE_POLICY false diff --git a/test/test_ibeta_inv.hpp b/test/test_ibeta_inv.hpp index 057b4a2f7c..8be95b7413 100644 --- a/test/test_ibeta_inv.hpp +++ b/test/test_ibeta_inv.hpp @@ -307,7 +307,7 @@ void test_spots(T) BOOST_MATH_CHECK_THROW(::boost::math::ibeta_inv(static_cast(2.125), -n, static_cast(0.125)), std::domain_error); BOOST_MATH_CHECK_THROW(::boost::math::ibeta_inv(static_cast(2.125), static_cast(1.125), -n), std::domain_error); } - #ifndef SYCL_LANGUAGE_VERSION + #ifndef BOOST_MATH_ENABLE_SYCL if (boost::math::detail::has_denorm_now()) { T m = std::numeric_limits::denorm_min(); diff --git a/test/test_ibeta_inv_ab.cpp b/test/test_ibeta_inv_ab.cpp index 3cfdc0a46e..9efb0cc603 100644 --- a/test/test_ibeta_inv_ab.cpp +++ b/test/test_ibeta_inv_ab.cpp @@ -3,7 +3,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #else #include "sycl/sycl.hpp" diff --git a/test/test_igamma.cpp b/test/test_igamma.cpp index ca515fd1f2..ddc37f0759 100644 --- a/test/test_igamma.cpp +++ b/test/test_igamma.cpp @@ -3,7 +3,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #else #include "sycl/sycl.hpp" diff --git a/test/test_igamma_inv.cpp b/test/test_igamma_inv.cpp index 5f5b1c7299..40a4191d93 100644 --- a/test/test_igamma_inv.cpp +++ b/test/test_igamma_inv.cpp @@ -3,7 +3,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #else #include "sycl/sycl.hpp" @@ -102,7 +102,7 @@ void expected_results() "linux.*", // platform largest_type, // test type(s) "[^|]*medium[^|]*", // test data group - #ifdef SYCL_LANGUAGE_VERSION + #ifdef BOOST_MATH_ENABLE_SYCL "[^|]*", 350, 50); #else "[^|]*", 350, 5); // test function @@ -113,7 +113,7 @@ void expected_results() "linux.*", // platform largest_type, // test type(s) "[^|]*large[^|]*", // test data group - #ifdef SYCL_LANGUAGE_VERSION + #ifdef BOOST_MATH_ENABLE_SYCL "[^|]*", 150, 20); // test function #else "[^|]*", 150, 5); // test function diff --git a/test/test_igamma_inva.cpp b/test/test_igamma_inva.cpp index a1d4261f06..e091bca05a 100644 --- a/test/test_igamma_inva.cpp +++ b/test/test_igamma_inva.cpp @@ -3,7 +3,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #else #include "sycl/sycl.hpp" diff --git a/test/test_inverse_chi_squared_distribution.cpp b/test/test_inverse_chi_squared_distribution.cpp index ef74526ad3..6d51bda277 100644 --- a/test/test_inverse_chi_squared_distribution.cpp +++ b/test/test_inverse_chi_squared_distribution.cpp @@ -12,7 +12,7 @@ # pragma warning (disable : 4310) // cast truncates constant value. #endif -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_inverse_gamma_distribution.cpp b/test/test_inverse_gamma_distribution.cpp index 7eb62a9aa0..4115e1e0c1 100644 --- a/test/test_inverse_gamma_distribution.cpp +++ b/test/test_inverse_gamma_distribution.cpp @@ -14,7 +14,7 @@ # pragma warning (disable : 4310) // cast truncates constant value #endif -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_jacobi_zeta.cpp b/test/test_jacobi_zeta.cpp index 313dd26460..a11e278f34 100644 --- a/test/test_jacobi_zeta.cpp +++ b/test/test_jacobi_zeta.cpp @@ -4,7 +4,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include // include /libs/math/src/ #else #include "sycl/sycl.hpp" diff --git a/test/test_landau.cpp b/test/test_landau.cpp index 9c0da57d92..96e9f9c3a7 100644 --- a/test/test_landau.cpp +++ b/test/test_landau.cpp @@ -7,7 +7,7 @@ #define BOOST_TEST_MAIN #define BOOST_TEST_MODULE StatsLandauTest -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_laplace.cpp b/test/test_laplace.cpp index e82df87953..954b94dc97 100644 --- a/test/test_laplace.cpp +++ b/test/test_laplace.cpp @@ -62,7 +62,7 @@ Test 8: test_extreme_function_arguments() #define BOOST_TEST_MAIN -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_log1p_simple.cpp b/test/test_log1p_simple.cpp index e5e928b9f4..782805a856 100644 --- a/test/test_log1p_simple.cpp +++ b/test/test_log1p_simple.cpp @@ -3,7 +3,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_logistic_dist.cpp b/test/test_logistic_dist.cpp index 6eb18e0677..62279773dd 100644 --- a/test/test_logistic_dist.cpp +++ b/test/test_logistic_dist.cpp @@ -11,7 +11,7 @@ # pragma warning (disable : 4512) // assignment operator could not be generated. #endif -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_lognormal.cpp b/test/test_lognormal.cpp index 81e14a641f..f0c7927034 100644 --- a/test/test_lognormal.cpp +++ b/test/test_lognormal.cpp @@ -8,7 +8,7 @@ // test_lognormal.cpp -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_mapairy.cpp b/test/test_mapairy.cpp index 87c3fe0068..030b5b996c 100644 --- a/test/test_mapairy.cpp +++ b/test/test_mapairy.cpp @@ -15,7 +15,7 @@ #define BOOST_TEST_MAIN #define BOOST_TEST_MODULE StatsMapAiryTest -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_nc_beta.cpp b/test/test_nc_beta.cpp index 7695bb9b6e..787944cef1 100644 --- a/test/test_nc_beta.cpp +++ b/test/test_nc_beta.cpp @@ -30,7 +30,7 @@ # define TEST_REAL_CONCEPT #endif -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_nc_chi_squared.cpp b/test/test_nc_chi_squared.cpp index 2a0c704090..868e99b715 100644 --- a/test/test_nc_chi_squared.cpp +++ b/test/test_nc_chi_squared.cpp @@ -7,7 +7,7 @@ // (See accompanying file LICENSE_1_0.txt // or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #endif @@ -30,7 +30,7 @@ #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error #endif -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_nc_f.cpp b/test/test_nc_f.cpp index dc9f450331..3a582a29a1 100644 --- a/test/test_nc_f.cpp +++ b/test/test_nc_f.cpp @@ -7,7 +7,7 @@ // (See accompanying file LICENSE_1_0.txt // or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #else #include "sycl/sycl.hpp" diff --git a/test/test_negative_binomial.cpp b/test/test_negative_binomial.cpp index f7a310f87f..57bc3d2404 100644 --- a/test/test_negative_binomial.cpp +++ b/test/test_negative_binomial.cpp @@ -26,7 +26,7 @@ # define TEST_REAL_CONCEPT #endif -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_normal.cpp b/test/test_normal.cpp index 636ff2c1ba..d02fcbe277 100644 --- a/test/test_normal.cpp +++ b/test/test_normal.cpp @@ -15,7 +15,7 @@ // From MathWorld--A Wolfram Web Resource. // http://mathworld.wolfram.com/NormalDistribution.html -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include // include directory /libs/math/src/tr1/ is needed. #else #include "sycl/sycl.hpp" diff --git a/test/test_pareto.cpp b/test/test_pareto.cpp index fc884837d5..6c1ff24754 100644 --- a/test/test_pareto.cpp +++ b/test/test_pareto.cpp @@ -24,7 +24,7 @@ # pragma warning(disable: 4100) // unreferenced formal parameter. #endif -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_poisson.cpp b/test/test_poisson.cpp index 3a142d279b..96e5f12d73 100644 --- a/test/test_poisson.cpp +++ b/test/test_poisson.cpp @@ -23,7 +23,7 @@ # pragma warning(disable: 4127) // conditional expression is constant. #endif -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_rayleigh.cpp b/test/test_rayleigh.cpp index 82ff80be26..5a15941a18 100644 --- a/test/test_rayleigh.cpp +++ b/test/test_rayleigh.cpp @@ -13,7 +13,7 @@ # pragma warning(disable: 4100) // unreferenced formal parameter. #endif -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_round.cpp b/test/test_round.cpp index 30414e75f2..2ed5a51c03 100644 --- a/test/test_round.cpp +++ b/test/test_round.cpp @@ -3,7 +3,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #else #include "sycl/sycl.hpp" diff --git a/test/test_saspoint5.cpp b/test/test_saspoint5.cpp index 424774e062..fc8845c08b 100644 --- a/test/test_saspoint5.cpp +++ b/test/test_saspoint5.cpp @@ -7,7 +7,7 @@ #define BOOST_TEST_MAIN #define BOOST_TEST_MODULE StatsSaSpoint5Test -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_sign.cpp b/test/test_sign.cpp index bb4963112a..aacff47591 100644 --- a/test/test_sign.cpp +++ b/test/test_sign.cpp @@ -6,7 +6,7 @@ // (See accompanying file LICENSE_1_0.txt // or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_students_t.cpp b/test/test_students_t.cpp index 918d3433b5..a08cf75a01 100644 --- a/test/test_students_t.cpp +++ b/test/test_students_t.cpp @@ -18,7 +18,7 @@ # pragma warning (disable :4127) // conditional expression is constant. #endif -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_triangular.cpp b/test/test_triangular.cpp index c7899c4e5d..dc916bb28e 100644 --- a/test/test_triangular.cpp +++ b/test/test_triangular.cpp @@ -8,7 +8,7 @@ // test_triangular.cpp -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #endif @@ -17,7 +17,7 @@ # pragma warning(disable: 4305) // truncation from 'long double' to 'float' #endif -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif diff --git a/test/test_trigamma.cpp b/test/test_trigamma.cpp index e758069c05..6a14cc7c69 100644 --- a/test/test_trigamma.cpp +++ b/test/test_trigamma.cpp @@ -4,7 +4,7 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #else #include "sycl/sycl.hpp" diff --git a/test/test_uniform.cpp b/test/test_uniform.cpp index 7538ffb121..b4b52d1f87 100644 --- a/test/test_uniform.cpp +++ b/test/test_uniform.cpp @@ -8,7 +8,7 @@ // test_uniform.cpp -#ifndef SYCL_LANGUAGE_VERSION +#ifndef BOOST_MATH_ENABLE_SYCL #include #else #include "sycl/sycl.hpp" diff --git a/test/test_weibull.cpp b/test/test_weibull.cpp index a0cb51ef77..5c3feec594 100644 --- a/test/test_weibull.cpp +++ b/test/test_weibull.cpp @@ -12,7 +12,7 @@ # pragma warning (disable : 4127) // conditional expression is constant. #endif -#ifdef SYCL_LANGUAGE_VERSION +#ifdef BOOST_MATH_ENABLE_SYCL #include "sycl/sycl.hpp" #endif