Thread pool
diff --git a/Eigen/ThreadPool b/Eigen/ThreadPool new file mode 100644 index 0000000..c9ea3d4 --- /dev/null +++ b/Eigen/ThreadPool
@@ -0,0 +1,68 @@ +// This file is part of Eigen, a lightweight C++ template library +// for linear algebra. +// +// Copyright (C) 2016 Benoit Steiner <benoit.steiner.goog@gmail.com> +// +// This Source Code Form is subject to the terms of the Mozilla +// Public License v. 2.0. If a copy of the MPL was not distributed +// with this file, You can obtain one at http://mozilla.org/MPL/2.0/. + +#ifndef EIGEN_THREADPOOL_MODULE_H +#define EIGEN_THREADPOOL_MODULE_H + +#include "Core" + +#include "src/Core/util/DisableStupidWarnings.h" + +/** \defgroup ThreadPool_Module ThreadPool Module + * + * This module provides 2 threadpool implementations + * - a simple reference implementation + * - a faster non blocking implementation + * + * \code + * #include <Eigen/ThreadPool> + * \endcode + */ + +#include <cstddef> +#include <cstring> +#include <time.h> + +#include <vector> +#include <atomic> +#include <condition_variable> +#include <deque> +#include <mutex> +#include <thread> +#include <functional> +#include <memory> +#include <utility> + +// There are non-parenthesized calls to "max" in the <unordered_map> header, +// which trigger a check in test/main.h causing compilation to fail. +// We work around the check here by removing the check for max in +// the case where we have to emulate thread_local. +#ifdef max +#undef max +#endif +#include <unordered_map> + +#include "src/Core/util/Meta.h" +#include "src/Core/util/MaxSizeVector.h" + +// IWYU pragma: begin_exports +#include "src/ThreadPool/ThreadLocal.h" +#include "src/ThreadPool/ThreadYield.h" +#include "src/ThreadPool/ThreadCancel.h" +#include "src/ThreadPool/EventCount.h" +#include "src/ThreadPool/RunQueue.h" +#include "src/ThreadPool/ThreadPoolInterface.h" +#include "src/ThreadPool/ThreadEnvironment.h" +#include "src/ThreadPool/Barrier.h" +#include "src/ThreadPool/NonBlockingThreadPool.h" +// IWYU pragma: end_exports + +#include "src/Core/util/ReenableStupidWarnings.h" + +#endif // EIGEN_CXX11_THREADPOOL_MODULE_H
diff --git a/unsupported/Eigen/CXX11/src/util/EmulateArray.h b/Eigen/src/Core/util/EmulateArray.h similarity index 100% rename from unsupported/Eigen/CXX11/src/util/EmulateArray.h rename to Eigen/src/Core/util/EmulateArray.h
diff --git a/unsupported/Eigen/CXX11/src/util/MaxSizeVector.h b/Eigen/src/Core/util/MaxSizeVector.h similarity index 100% rename from unsupported/Eigen/CXX11/src/util/MaxSizeVector.h rename to Eigen/src/Core/util/MaxSizeVector.h
diff --git a/Eigen/src/Core/util/Meta.h b/Eigen/src/Core/util/Meta.h index a192aac..c8eed35 100644 --- a/Eigen/src/Core/util/Meta.h +++ b/Eigen/src/Core/util/Meta.h
@@ -27,6 +27,8 @@ #endif +#include "EmulateArray.h" + // Define portable (u)int{32,64} types #include <cstdint> @@ -563,6 +565,513 @@ constexpr bool is_constant_evaluated() { return false; } #endif +template<typename... tt> +struct type_list { constexpr static int count = sizeof...(tt); }; + +template<typename t, typename... tt> +struct type_list<t, tt...> { constexpr static int count = sizeof...(tt) + 1; typedef t first_type; }; + +template<typename T, T... nn> +struct numeric_list { constexpr static std::size_t count = sizeof...(nn); }; + +template<typename T, T n, T... nn> +struct numeric_list<T, n, nn...> { static constexpr std::size_t count = sizeof...(nn) + 1; + static constexpr T first_value = n; }; + +#ifndef EIGEN_PARSED_BY_DOXYGEN +/* numeric list constructors + * + * equivalencies: + * constructor result + * typename gen_numeric_list<int, 5>::type numeric_list<int, 0,1,2,3,4> + * typename gen_numeric_list_reversed<int, 5>::type numeric_list<int, 4,3,2,1,0> + * typename gen_numeric_list_swapped_pair<int, 5,1,2>::type numeric_list<int, 0,2,1,3,4> + * typename gen_numeric_list_repeated<int, 0, 5>::type numeric_list<int, 0,0,0,0,0> + */ + +template<typename T, std::size_t n, T start = 0, T... ii> struct gen_numeric_list : gen_numeric_list<T, n-1, start, start + n-1, ii...> {}; +template<typename T, T start, T... ii> struct gen_numeric_list<T, 0, start, ii...> { typedef numeric_list<T, ii...> type; }; + +template<typename T, std::size_t n, T start = 0, T... ii> struct gen_numeric_list_reversed : gen_numeric_list_reversed<T, n-1, start, ii..., start + n-1> {}; +template<typename T, T start, T... ii> struct gen_numeric_list_reversed<T, 0, start, ii...> { typedef numeric_list<T, ii...> type; }; + +template<typename T, std::size_t n, T a, T b, T start = 0, T... ii> struct gen_numeric_list_swapped_pair : gen_numeric_list_swapped_pair<T, n-1, a, b, start, (start + n-1) == a ? b : ((start + n-1) == b ? a : (start + n-1)), ii...> {}; +template<typename T, T a, T b, T start, T... ii> struct gen_numeric_list_swapped_pair<T, 0, a, b, start, ii...> { typedef numeric_list<T, ii...> type; }; + +template<typename T, std::size_t n, T V, T... nn> struct gen_numeric_list_repeated : gen_numeric_list_repeated<T, n-1, V, V, nn...> {}; +template<typename T, T V, T... nn> struct gen_numeric_list_repeated<T, 0, V, nn...> { typedef numeric_list<T, nn...> type; }; + +/* list manipulation: concatenate */ + +template<class a, class b> struct concat; + +template<typename... as, typename... bs> struct concat<type_list<as...>, type_list<bs...>> { typedef type_list<as..., bs...> type; }; +template<typename T, T... as, T... bs> struct concat<numeric_list<T, as...>, numeric_list<T, bs...> > { typedef numeric_list<T, as..., bs...> type; }; + +template<typename... p> struct mconcat; +template<typename a> struct mconcat<a> { typedef a type; }; +template<typename a, typename b> struct mconcat<a, b> : concat<a, b> {}; +template<typename a, typename b, typename... cs> struct mconcat<a, b, cs...> : concat<a, typename mconcat<b, cs...>::type> {}; + +/* list manipulation: extract slices */ + +template<int n, typename x> struct take; +template<int n, typename a, typename... as> struct take<n, type_list<a, as...>> : concat<type_list<a>, typename take<n-1, type_list<as...>>::type> {}; +template<int n> struct take<n, type_list<>> { typedef type_list<> type; }; +template<typename a, typename... as> struct take<0, type_list<a, as...>> { typedef type_list<> type; }; +template<> struct take<0, type_list<>> { typedef type_list<> type; }; + +template<typename T, int n, T a, T... as> struct take<n, numeric_list<T, a, as...>> : concat<numeric_list<T, a>, typename take<n-1, numeric_list<T, as...>>::type> {}; +// XXX The following breaks in gcc-11, and is invalid anyways. +// template<typename T, int n> struct take<n, numeric_list<T>> { typedef numeric_list<T> type; }; +template<typename T, T a, T... as> struct take<0, numeric_list<T, a, as...>> { typedef numeric_list<T> type; }; +template<typename T> struct take<0, numeric_list<T>> { typedef numeric_list<T> type; }; + +template<typename T, int n, T... ii> struct h_skip_helper_numeric; +template<typename T, int n, T i, T... ii> struct h_skip_helper_numeric<T, n, i, ii...> : h_skip_helper_numeric<T, n-1, ii...> {}; +template<typename T, T i, T... ii> struct h_skip_helper_numeric<T, 0, i, ii...> { typedef numeric_list<T, i, ii...> type; }; +template<typename T, int n> struct h_skip_helper_numeric<T, n> { typedef numeric_list<T> type; }; +template<typename T> struct h_skip_helper_numeric<T, 0> { typedef numeric_list<T> type; }; + +template<int n, typename... tt> struct h_skip_helper_type; +template<int n, typename t, typename... tt> struct h_skip_helper_type<n, t, tt...> : h_skip_helper_type<n-1, tt...> {}; +template<typename t, typename... tt> struct h_skip_helper_type<0, t, tt...> { typedef type_list<t, tt...> type; }; +template<int n> struct h_skip_helper_type<n> { typedef type_list<> type; }; +template<> struct h_skip_helper_type<0> { typedef type_list<> type; }; +#endif //not EIGEN_PARSED_BY_DOXYGEN + +template<int n> +struct h_skip { + template<typename T, T... ii> + constexpr static EIGEN_STRONG_INLINE typename h_skip_helper_numeric<T, n, ii...>::type helper(numeric_list<T, ii...>) { return typename h_skip_helper_numeric<T, n, ii...>::type(); } + template<typename... tt> + constexpr static EIGEN_STRONG_INLINE typename h_skip_helper_type<n, tt...>::type helper(type_list<tt...>) { return typename h_skip_helper_type<n, tt...>::type(); } +}; + +template<int n, typename a> struct skip { typedef decltype(h_skip<n>::helper(a())) type; }; + +template<int start, int count, typename a> struct slice : take<count, typename skip<start, a>::type> {}; + +/* list manipulation: retrieve single element from list */ + +template<int n, typename x> struct get; + +template<int n, typename a, typename... as> struct get<n, type_list<a, as...>> : get<n-1, type_list<as...>> {}; +template<typename a, typename... as> struct get<0, type_list<a, as...>> { typedef a type; }; + +template<typename T, int n, T a, T... as> struct get<n, numeric_list<T, a, as...>> : get<n-1, numeric_list<T, as...>> {}; +template<typename T, T a, T... as> struct get<0, numeric_list<T, a, as...>> { constexpr static T value = a; }; + +template<std::size_t n, typename T, T a, T... as> constexpr T array_get(const numeric_list<T, a, as...>&) { + return get<(int)n, numeric_list<T, a, as...>>::value; +} + +/* always get type, regardless of dummy; good for parameter pack expansion */ + +template<typename T, T dummy, typename t> struct id_numeric { typedef t type; }; +template<typename dummy, typename t> struct id_type { typedef t type; }; + +/* equality checking, flagged version */ + +template<typename a, typename b> struct is_same_gf : is_same<a, b> { constexpr static int global_flags = 0; }; + +/* apply_op to list */ + +template< + bool from_left, // false + template<typename, typename> class op, + typename additional_param, + typename... values +> +struct h_apply_op_helper { typedef type_list<typename op<values, additional_param>::type...> type; }; +template< + template<typename, typename> class op, + typename additional_param, + typename... values +> +struct h_apply_op_helper<true, op, additional_param, values...> { typedef type_list<typename op<additional_param, values>::type...> type; }; + +template< + bool from_left, + template<typename, typename> class op, + typename additional_param +> +struct h_apply_op +{ + template<typename... values> + constexpr static typename h_apply_op_helper<from_left, op, additional_param, values...>::type helper(type_list<values...>) + { return typename h_apply_op_helper<from_left, op, additional_param, values...>::type(); } +}; + +template< + template<typename, typename> class op, + typename additional_param, + typename a +> +struct apply_op_from_left { typedef decltype(h_apply_op<true, op, additional_param>::helper(a())) type; }; + +template< + template<typename, typename> class op, + typename additional_param, + typename a +> +struct apply_op_from_right { typedef decltype(h_apply_op<false, op, additional_param>::helper(a())) type; }; + +/* see if an element is in a list */ + +template< + template<typename, typename> class test, + typename check_against, + typename h_list, + bool last_check_positive = false +> +struct contained_in_list; + +template< + template<typename, typename> class test, + typename check_against, + typename h_list +> +struct contained_in_list<test, check_against, h_list, true> +{ + constexpr static bool value = true; +}; + +template< + template<typename, typename> class test, + typename check_against, + typename a, + typename... as +> +struct contained_in_list<test, check_against, type_list<a, as...>, false> : contained_in_list<test, check_against, type_list<as...>, test<check_against, a>::value> {}; + +template< + template<typename, typename> class test, + typename check_against, + typename... empty +> +struct contained_in_list<test, check_against, type_list<empty...>, false> { constexpr static bool value = false; }; + +/* see if an element is in a list and check for global flags */ + +template< + template<typename, typename> class test, + typename check_against, + typename h_list, + int default_flags = 0, + bool last_check_positive = false, + int last_check_flags = default_flags +> +struct contained_in_list_gf; + +template< + template<typename, typename> class test, + typename check_against, + typename h_list, + int default_flags, + int last_check_flags +> +struct contained_in_list_gf<test, check_against, h_list, default_flags, true, last_check_flags> +{ + constexpr static bool value = true; + constexpr static int global_flags = last_check_flags; +}; + +template< + template<typename, typename> class test, + typename check_against, + typename a, + typename... as, + int default_flags, + int last_check_flags +> +struct contained_in_list_gf<test, check_against, type_list<a, as...>, default_flags, false, last_check_flags> : contained_in_list_gf<test, check_against, type_list<as...>, default_flags, test<check_against, a>::value, test<check_against, a>::global_flags> {}; + +template< + template<typename, typename> class test, + typename check_against, + typename... empty, + int default_flags, + int last_check_flags +> +struct contained_in_list_gf<test, check_against, type_list<empty...>, default_flags, false, last_check_flags> { constexpr static bool value = false; constexpr static int global_flags = default_flags; }; + +/* generic reductions */ + +template< + typename Reducer, + typename... Ts +> struct reduce; + +template< + typename Reducer +> struct reduce<Reducer> +{ + EIGEN_DEVICE_FUNC constexpr static EIGEN_STRONG_INLINE int run() { return Reducer::Identity; } +}; + +template< + typename Reducer, + typename A +> struct reduce<Reducer, A> +{ + EIGEN_DEVICE_FUNC constexpr static EIGEN_STRONG_INLINE A run(A a) { return a; } +}; + +template< + typename Reducer, + typename A, + typename... Ts +> struct reduce<Reducer, A, Ts...> +{ + EIGEN_DEVICE_FUNC constexpr static EIGEN_STRONG_INLINE auto run(A a, Ts... ts) -> decltype(Reducer::run(a, reduce<Reducer, Ts...>::run(ts...))) { + return Reducer::run(a, reduce<Reducer, Ts...>::run(ts...)); + } +}; + +/* generic binary operations */ + +struct sum_op { + template<typename A, typename B> EIGEN_DEVICE_FUNC constexpr static EIGEN_STRONG_INLINE auto run(A a, B b) -> decltype(a + b) { return a + b; } + static constexpr int Identity = 0; +}; +struct product_op { + template<typename A, typename B> EIGEN_DEVICE_FUNC constexpr static EIGEN_STRONG_INLINE auto run(A a, B b) -> decltype(a * b) { return a * b; } + static constexpr int Identity = 1; +}; + +struct logical_and_op { template<typename A, typename B> constexpr static EIGEN_STRONG_INLINE auto run(A a, B b) -> decltype(a && b) { return a && b; } }; +struct logical_or_op { template<typename A, typename B> constexpr static EIGEN_STRONG_INLINE auto run(A a, B b) -> decltype(a || b) { return a || b; } }; + +struct equal_op { template<typename A, typename B> constexpr static EIGEN_STRONG_INLINE auto run(A a, B b) -> decltype(a == b) { return a == b; } }; +struct not_equal_op { template<typename A, typename B> constexpr static EIGEN_STRONG_INLINE auto run(A a, B b) -> decltype(a != b) { return a != b; } }; +struct lesser_op { template<typename A, typename B> constexpr static EIGEN_STRONG_INLINE auto run(A a, B b) -> decltype(a < b) { return a < b; } }; +struct lesser_equal_op { template<typename A, typename B> constexpr static EIGEN_STRONG_INLINE auto run(A a, B b) -> decltype(a <= b) { return a <= b; } }; +struct greater_op { template<typename A, typename B> constexpr static EIGEN_STRONG_INLINE auto run(A a, B b) -> decltype(a > b) { return a > b; } }; +struct greater_equal_op { template<typename A, typename B> constexpr static EIGEN_STRONG_INLINE auto run(A a, B b) -> decltype(a >= b) { return a >= b; } }; + +/* generic unary operations */ + +struct not_op { template<typename A> constexpr static EIGEN_STRONG_INLINE auto run(A a) -> decltype(!a) { return !a; } }; +struct negation_op { template<typename A> constexpr static EIGEN_STRONG_INLINE auto run(A a) -> decltype(-a) { return -a; } }; +struct greater_equal_zero_op { template<typename A> constexpr static EIGEN_STRONG_INLINE auto run(A a) -> decltype(a >= 0) { return a >= 0; } }; + + +/* reductions for lists */ + +// using auto -> return value spec makes ICC 13.0 and 13.1 crash here, so we have to hack it +// together in front... (13.0 doesn't work with array_prod/array_reduce/... anyway, but 13.1 +// does... +template<typename... Ts> +EIGEN_DEVICE_FUNC constexpr EIGEN_STRONG_INLINE decltype(reduce<product_op, Ts...>::run((*((Ts*)0))...)) arg_prod(Ts... ts) +{ + return reduce<product_op, Ts...>::run(ts...); +} + +template<typename... Ts> +constexpr EIGEN_STRONG_INLINE decltype(reduce<sum_op, Ts...>::run((*((Ts*)0))...)) arg_sum(Ts... ts) +{ + return reduce<sum_op, Ts...>::run(ts...); +} + +/* reverse arrays */ + +template<typename Array, int... n> +constexpr EIGEN_STRONG_INLINE Array h_array_reverse(Array arr, numeric_list<int, n...>) +{ + return {{array_get<sizeof...(n) - n - 1>(arr)...}}; +} + +template<typename T, std::size_t N> +constexpr EIGEN_STRONG_INLINE array<T, N> array_reverse(array<T, N> arr) +{ + return h_array_reverse(arr, typename gen_numeric_list<int, N>::type()); +} + + +/* generic array reductions */ + +// can't reuse standard reduce() interface above because Intel's Compiler +// *really* doesn't like it, so we just reimplement the stuff +// (start from N - 1 and work down to 0 because specialization for +// n == N - 1 also doesn't work in Intel's compiler, so it goes into +// an infinite loop) +template<typename Reducer, typename T, std::size_t N, std::size_t n = N - 1> +struct h_array_reduce { + EIGEN_DEVICE_FUNC constexpr static EIGEN_STRONG_INLINE auto run(array<T, N> arr, T identity) -> decltype(Reducer::run(h_array_reduce<Reducer, T, N, n - 1>::run(arr, identity), array_get<n>(arr))) + { + return Reducer::run(h_array_reduce<Reducer, T, N, n - 1>::run(arr, identity), array_get<n>(arr)); + } +}; + +template<typename Reducer, typename T, std::size_t N> +struct h_array_reduce<Reducer, T, N, 0> +{ + EIGEN_DEVICE_FUNC constexpr static EIGEN_STRONG_INLINE T run(const array<T, N>& arr, T) + { + return array_get<0>(arr); + } +}; + +template<typename Reducer, typename T> +struct h_array_reduce<Reducer, T, 0> +{ + EIGEN_DEVICE_FUNC constexpr static EIGEN_STRONG_INLINE T run(const array<T, 0>&, T identity) + { + return identity; + } +}; + +template<typename Reducer, typename T, std::size_t N> +EIGEN_DEVICE_FUNC constexpr EIGEN_STRONG_INLINE auto array_reduce(const array<T, N>& arr, T identity) -> decltype(h_array_reduce<Reducer, T, N>::run(arr, identity)) +{ + return h_array_reduce<Reducer, T, N>::run(arr, identity); +} + +/* standard array reductions */ + +template<typename T, std::size_t N> +EIGEN_DEVICE_FUNC constexpr EIGEN_STRONG_INLINE auto array_sum(const array<T, N>& arr) -> decltype(array_reduce<sum_op, T, N>(arr, static_cast<T>(0))) +{ + return array_reduce<sum_op, T, N>(arr, static_cast<T>(0)); +} + +template<typename T, std::size_t N> +EIGEN_DEVICE_FUNC constexpr EIGEN_STRONG_INLINE auto array_prod(const array<T, N>& arr) -> decltype(array_reduce<product_op, T, N>(arr, static_cast<T>(1))) +{ + return array_reduce<product_op, T, N>(arr, static_cast<T>(1)); +} + +template<typename t> +EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE t array_prod(const std::vector<t>& a) { + eigen_assert(a.size() > 0); + t prod = 1; + for (size_t i = 0; i < a.size(); ++i) { prod *= a[i]; } + return prod; +} + +/* zip an array */ + +template<typename Op, typename A, typename B, std::size_t N, int... n> +constexpr EIGEN_STRONG_INLINE array<decltype(Op::run(A(), B())),N> h_array_zip(array<A, N> a, array<B, N> b, numeric_list<int, n...>) +{ + return array<decltype(Op::run(A(), B())),N>{{ Op::run(array_get<n>(a), array_get<n>(b))... }}; +} + +template<typename Op, typename A, typename B, std::size_t N> +constexpr EIGEN_STRONG_INLINE array<decltype(Op::run(A(), B())),N> array_zip(array<A, N> a, array<B, N> b) +{ + return h_array_zip<Op>(a, b, typename gen_numeric_list<int, N>::type()); +} + +/* zip an array and reduce the result */ + +template<typename Reducer, typename Op, typename A, typename B, std::size_t N, int... n> +constexpr EIGEN_STRONG_INLINE auto h_array_zip_and_reduce(array<A, N> a, array<B, N> b, numeric_list<int, n...>) -> decltype(reduce<Reducer, typename id_numeric<int,n,decltype(Op::run(A(), B()))>::type...>::run(Op::run(array_get<n>(a), array_get<n>(b))...)) +{ + return reduce<Reducer, typename id_numeric<int,n,decltype(Op::run(A(), B()))>::type...>::run(Op::run(array_get<n>(a), array_get<n>(b))...); +} + +template<typename Reducer, typename Op, typename A, typename B, std::size_t N> +constexpr EIGEN_STRONG_INLINE auto array_zip_and_reduce(array<A, N> a, array<B, N> b) -> decltype(h_array_zip_and_reduce<Reducer, Op, A, B, N>(a, b, typename gen_numeric_list<int, N>::type())) +{ + return h_array_zip_and_reduce<Reducer, Op, A, B, N>(a, b, typename gen_numeric_list<int, N>::type()); +} + +/* apply stuff to an array */ + +template<typename Op, typename A, std::size_t N, int... n> +constexpr EIGEN_STRONG_INLINE array<decltype(Op::run(A())),N> h_array_apply(array<A, N> a, numeric_list<int, n...>) +{ + return array<decltype(Op::run(A())),N>{{ Op::run(array_get<n>(a))... }}; +} + +template<typename Op, typename A, std::size_t N> +constexpr EIGEN_STRONG_INLINE array<decltype(Op::run(A())),N> array_apply(array<A, N> a) +{ + return h_array_apply<Op>(a, typename gen_numeric_list<int, N>::type()); +} + +/* apply stuff to an array and reduce */ + +template<typename Reducer, typename Op, typename A, std::size_t N, int... n> +constexpr EIGEN_STRONG_INLINE auto h_array_apply_and_reduce(array<A, N> arr, numeric_list<int, n...>) -> decltype(reduce<Reducer, typename id_numeric<int,n,decltype(Op::run(A()))>::type...>::run(Op::run(array_get<n>(arr))...)) +{ + return reduce<Reducer, typename id_numeric<int,n,decltype(Op::run(A()))>::type...>::run(Op::run(array_get<n>(arr))...); +} + +template<typename Reducer, typename Op, typename A, std::size_t N> +constexpr EIGEN_STRONG_INLINE auto array_apply_and_reduce(array<A, N> a) -> decltype(h_array_apply_and_reduce<Reducer, Op, A, N>(a, typename gen_numeric_list<int, N>::type())) +{ + return h_array_apply_and_reduce<Reducer, Op, A, N>(a, typename gen_numeric_list<int, N>::type()); +} + +/* repeat a value n times (and make an array out of it + * usage: + * array<int, 16> = repeat<16>(42); + */ + +template<int n> +struct h_repeat +{ + template<typename t, int... ii> + constexpr static EIGEN_STRONG_INLINE array<t, n> run(t v, numeric_list<int, ii...>) + { + return {{ typename id_numeric<int, ii, t>::type(v)... }}; + } +}; + +template<int n, typename t> +constexpr array<t, n> repeat(t v) { return h_repeat<n>::run(v, typename gen_numeric_list<int, n>::type()); } + +/* instantiate a class by a C-style array */ +template<class InstType, typename ArrType, std::size_t N, bool Reverse, typename... Ps> +struct h_instantiate_by_c_array; + +template<class InstType, typename ArrType, std::size_t N, typename... Ps> +struct h_instantiate_by_c_array<InstType, ArrType, N, false, Ps...> +{ + static InstType run(ArrType* arr, Ps... args) + { + return h_instantiate_by_c_array<InstType, ArrType, N - 1, false, Ps..., ArrType>::run(arr + 1, args..., arr[0]); + } +}; + +template<class InstType, typename ArrType, std::size_t N, typename... Ps> +struct h_instantiate_by_c_array<InstType, ArrType, N, true, Ps...> +{ + static InstType run(ArrType* arr, Ps... args) + { + return h_instantiate_by_c_array<InstType, ArrType, N - 1, false, ArrType, Ps...>::run(arr + 1, arr[0], args...); + } +}; + +template<class InstType, typename ArrType, typename... Ps> +struct h_instantiate_by_c_array<InstType, ArrType, 0, false, Ps...> +{ + static InstType run(ArrType* arr, Ps... args) + { + (void)arr; + return InstType(args...); + } +}; + +template<class InstType, typename ArrType, typename... Ps> +struct h_instantiate_by_c_array<InstType, ArrType, 0, true, Ps...> +{ + static InstType run(ArrType* arr, Ps... args) + { + (void)arr; + return InstType(args...); + } +}; + +template<class InstType, typename ArrType, std::size_t N, bool Reverse = false> +InstType instantiate_by_c_array(ArrType* arr) +{ + return h_instantiate_by_c_array<InstType, ArrType, N, Reverse>::run(arr); +} + } // end namespace internal } // end namespace Eigen
diff --git a/unsupported/Eigen/CXX11/src/ThreadPool/Barrier.h b/Eigen/src/ThreadPool/Barrier.h similarity index 100% rename from unsupported/Eigen/CXX11/src/ThreadPool/Barrier.h rename to Eigen/src/ThreadPool/Barrier.h
diff --git a/unsupported/Eigen/CXX11/src/ThreadPool/EventCount.h b/Eigen/src/ThreadPool/EventCount.h similarity index 100% rename from unsupported/Eigen/CXX11/src/ThreadPool/EventCount.h rename to Eigen/src/ThreadPool/EventCount.h
diff --git a/unsupported/Eigen/CXX11/src/ThreadPool/InternalHeaderCheck.h b/Eigen/src/ThreadPool/InternalHeaderCheck.h similarity index 76% rename from unsupported/Eigen/CXX11/src/ThreadPool/InternalHeaderCheck.h rename to Eigen/src/ThreadPool/InternalHeaderCheck.h index 82a89a9..44c0fca 100644 --- a/unsupported/Eigen/CXX11/src/ThreadPool/InternalHeaderCheck.h +++ b/Eigen/src/ThreadPool/InternalHeaderCheck.h
@@ -1,3 +1,3 @@ -#ifndef EIGEN_CXX11_THREADPOOL_MODULE_H +#ifndef EIGEN_THREADPOOL_MODULE_H #error "Please include unsupported/Eigen/CXX11/ThreadPool instead of including headers inside the src directory directly." #endif
diff --git a/unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h b/Eigen/src/ThreadPool/NonBlockingThreadPool.h similarity index 100% rename from unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h rename to Eigen/src/ThreadPool/NonBlockingThreadPool.h
diff --git a/unsupported/Eigen/CXX11/src/ThreadPool/RunQueue.h b/Eigen/src/ThreadPool/RunQueue.h similarity index 100% rename from unsupported/Eigen/CXX11/src/ThreadPool/RunQueue.h rename to Eigen/src/ThreadPool/RunQueue.h
diff --git a/unsupported/Eigen/CXX11/src/ThreadPool/ThreadCancel.h b/Eigen/src/ThreadPool/ThreadCancel.h similarity index 100% rename from unsupported/Eigen/CXX11/src/ThreadPool/ThreadCancel.h rename to Eigen/src/ThreadPool/ThreadCancel.h
diff --git a/unsupported/Eigen/CXX11/src/ThreadPool/ThreadEnvironment.h b/Eigen/src/ThreadPool/ThreadEnvironment.h similarity index 100% rename from unsupported/Eigen/CXX11/src/ThreadPool/ThreadEnvironment.h rename to Eigen/src/ThreadPool/ThreadEnvironment.h
diff --git a/unsupported/Eigen/CXX11/src/ThreadPool/ThreadLocal.h b/Eigen/src/ThreadPool/ThreadLocal.h similarity index 100% rename from unsupported/Eigen/CXX11/src/ThreadPool/ThreadLocal.h rename to Eigen/src/ThreadPool/ThreadLocal.h
diff --git a/unsupported/Eigen/CXX11/src/ThreadPool/ThreadPoolInterface.h b/Eigen/src/ThreadPool/ThreadPoolInterface.h similarity index 100% rename from unsupported/Eigen/CXX11/src/ThreadPool/ThreadPoolInterface.h rename to Eigen/src/ThreadPool/ThreadPoolInterface.h
diff --git a/unsupported/Eigen/CXX11/src/ThreadPool/ThreadYield.h b/Eigen/src/ThreadPool/ThreadYield.h similarity index 100% rename from unsupported/Eigen/CXX11/src/ThreadPool/ThreadYield.h rename to Eigen/src/ThreadPool/ThreadYield.h
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f402ab3..98d1bad 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt
@@ -173,6 +173,7 @@ ei_add_test(rand) ei_add_test(meta) +ei_add_test(maxsizevector) ei_add_test(numext) ei_add_test(sizeof) ei_add_test(dynalloc) @@ -311,7 +312,9 @@ ei_add_test(diagonal_matrix_variadic_ctor) ei_add_test(serializer) ei_add_test(tuple_test) - +ei_add_test(threads_eventcount "-pthread" "${CMAKE_THREAD_LIBS_INIT}") +ei_add_test(threads_runqueue "-pthread" "${CMAKE_THREAD_LIBS_INIT}") +ei_add_test(threads_non_blocking_thread_pool "-pthread" "${CMAKE_THREAD_LIBS_INIT}") add_executable(bug1213 bug1213.cpp bug1213_main.cpp) check_cxx_compiler_flag("-ffast-math" COMPILER_SUPPORT_FASTMATH)
diff --git a/unsupported/test/cxx11_maxsizevector.cpp b/test/maxsizevector.cpp similarity index 96% rename from unsupported/test/cxx11_maxsizevector.cpp rename to test/maxsizevector.cpp index 22b51ba..084ea13 100644 --- a/unsupported/test/cxx11_maxsizevector.cpp +++ b/test/maxsizevector.cpp
@@ -2,7 +2,7 @@ #include <exception> // std::exception -#include <unsupported/Eigen/CXX11/Tensor> +#include <Eigen/src/Core/util/MaxSizeVector.h> struct Foo {
diff --git a/test/meta.cpp b/test/meta.cpp index 97ebdd7..7e73706 100644 --- a/test/meta.cpp +++ b/test/meta.cpp
@@ -9,6 +9,9 @@ #include "main.h" +#include <array> +#include <Eigen/src/Core/util/Meta.h> + template<typename From, typename To> bool check_is_convertible(const From&, const To&) { @@ -131,3 +134,347 @@ VERIFY_META_SQRT(1024); VERIFY_META_SQRT(1025); } + +using Eigen::internal::is_same; +using Eigen::internal::type_list; +using Eigen::internal::numeric_list; +using Eigen::internal::gen_numeric_list; +using Eigen::internal::gen_numeric_list_reversed; +using Eigen::internal::gen_numeric_list_swapped_pair; +using Eigen::internal::gen_numeric_list_repeated; +using Eigen::internal::concat; +using Eigen::internal::mconcat; +using Eigen::internal::take; +using Eigen::internal::skip; +using Eigen::internal::slice; +using Eigen::internal::get; +using Eigen::internal::id_numeric; +using Eigen::internal::id_type; +using Eigen::internal::is_same_gf; +using Eigen::internal::apply_op_from_left; +using Eigen::internal::apply_op_from_right; +using Eigen::internal::contained_in_list; +using Eigen::internal::contained_in_list_gf; +using Eigen::internal::arg_prod; +using Eigen::internal::arg_sum; +using Eigen::internal::sum_op; +using Eigen::internal::product_op; +using Eigen::internal::array_reverse; +using Eigen::internal::array_sum; +using Eigen::internal::array_prod; +using Eigen::internal::array_reduce; +using Eigen::internal::array_zip; +using Eigen::internal::array_zip_and_reduce; +using Eigen::internal::array_apply; +using Eigen::internal::array_apply_and_reduce; +using Eigen::internal::repeat; +using Eigen::internal::instantiate_by_c_array; + +struct dummy_a {}; +struct dummy_b {}; +struct dummy_c {}; +struct dummy_d {}; +struct dummy_e {}; + +// dummy operation for testing apply +template<typename A, typename B> struct dummy_op; +template<> struct dummy_op<dummy_a, dummy_b> { typedef dummy_c type; }; +template<> struct dummy_op<dummy_b, dummy_a> { typedef dummy_d type; }; +template<> struct dummy_op<dummy_b, dummy_c> { typedef dummy_a type; }; +template<> struct dummy_op<dummy_c, dummy_b> { typedef dummy_d type; }; +template<> struct dummy_op<dummy_c, dummy_a> { typedef dummy_b type; }; +template<> struct dummy_op<dummy_a, dummy_c> { typedef dummy_d type; }; +template<> struct dummy_op<dummy_a, dummy_a> { typedef dummy_e type; }; +template<> struct dummy_op<dummy_b, dummy_b> { typedef dummy_e type; }; +template<> struct dummy_op<dummy_c, dummy_c> { typedef dummy_e type; }; + +template<typename A, typename B> struct dummy_test { constexpr static bool value = false; constexpr static int global_flags = 0; }; +template<> struct dummy_test<dummy_a, dummy_a> { constexpr static bool value = true; constexpr static int global_flags = 1; }; +template<> struct dummy_test<dummy_b, dummy_b> { constexpr static bool value = true; constexpr static int global_flags = 2; }; +template<> struct dummy_test<dummy_c, dummy_c> { constexpr static bool value = true; constexpr static int global_flags = 4; }; + +struct times2_op { template<typename A> static A run(A v) { return v * 2; } }; + +struct dummy_inst +{ + int c; + + dummy_inst() : c(0) {} + explicit dummy_inst(int) : c(1) {} + dummy_inst(int, int) : c(2) {} + dummy_inst(int, int, int) : c(3) {} + dummy_inst(int, int, int, int) : c(4) {} + dummy_inst(int, int, int, int, int) : c(5) {} +}; + +static void test_gen_numeric_list() +{ + VERIFY((is_same<typename gen_numeric_list<int, 0>::type, numeric_list<int>>::value)); + VERIFY((is_same<typename gen_numeric_list<int, 1>::type, numeric_list<int, 0>>::value)); + VERIFY((is_same<typename gen_numeric_list<int, 2>::type, numeric_list<int, 0, 1>>::value)); + VERIFY((is_same<typename gen_numeric_list<int, 5>::type, numeric_list<int, 0, 1, 2, 3, 4>>::value)); + VERIFY((is_same<typename gen_numeric_list<int, 10>::type, numeric_list<int, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9>>::value)); + + VERIFY((is_same<typename gen_numeric_list<int, 0, 42>::type, numeric_list<int>>::value)); + VERIFY((is_same<typename gen_numeric_list<int, 1, 42>::type, numeric_list<int, 42>>::value)); + VERIFY((is_same<typename gen_numeric_list<int, 2, 42>::type, numeric_list<int, 42, 43>>::value)); + VERIFY((is_same<typename gen_numeric_list<int, 5, 42>::type, numeric_list<int, 42, 43, 44, 45, 46>>::value)); + VERIFY((is_same<typename gen_numeric_list<int, 10, 42>::type, numeric_list<int, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51>>::value)); + + VERIFY((is_same<typename gen_numeric_list_reversed<int, 0>::type, numeric_list<int>>::value)); + VERIFY((is_same<typename gen_numeric_list_reversed<int, 1>::type, numeric_list<int, 0>>::value)); + VERIFY((is_same<typename gen_numeric_list_reversed<int, 2>::type, numeric_list<int, 1, 0>>::value)); + VERIFY((is_same<typename gen_numeric_list_reversed<int, 5>::type, numeric_list<int, 4, 3, 2, 1, 0>>::value)); + VERIFY((is_same<typename gen_numeric_list_reversed<int, 10>::type, numeric_list<int, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0>>::value)); + + VERIFY((is_same<typename gen_numeric_list_reversed<int, 0, 42>::type, numeric_list<int>>::value)); + VERIFY((is_same<typename gen_numeric_list_reversed<int, 1, 42>::type, numeric_list<int, 42>>::value)); + VERIFY((is_same<typename gen_numeric_list_reversed<int, 2, 42>::type, numeric_list<int, 43, 42>>::value)); + VERIFY((is_same<typename gen_numeric_list_reversed<int, 5, 42>::type, numeric_list<int, 46, 45, 44, 43, 42>>::value)); + VERIFY((is_same<typename gen_numeric_list_reversed<int, 10, 42>::type, numeric_list<int, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42>>::value)); + + VERIFY((is_same<typename gen_numeric_list_swapped_pair<int, 0, 2, 3>::type, numeric_list<int>>::value)); + VERIFY((is_same<typename gen_numeric_list_swapped_pair<int, 1, 2, 3>::type, numeric_list<int, 0>>::value)); + VERIFY((is_same<typename gen_numeric_list_swapped_pair<int, 2, 2, 3>::type, numeric_list<int, 0, 1>>::value)); + VERIFY((is_same<typename gen_numeric_list_swapped_pair<int, 5, 2, 3>::type, numeric_list<int, 0, 1, 3, 2, 4>>::value)); + VERIFY((is_same<typename gen_numeric_list_swapped_pair<int, 10, 2, 3>::type, numeric_list<int, 0, 1, 3, 2, 4, 5, 6, 7, 8, 9>>::value)); + + VERIFY((is_same<typename gen_numeric_list_swapped_pair<int, 0, 44, 45, 42>::type, numeric_list<int>>::value)); + VERIFY((is_same<typename gen_numeric_list_swapped_pair<int, 1, 44, 45, 42>::type, numeric_list<int, 42>>::value)); + VERIFY((is_same<typename gen_numeric_list_swapped_pair<int, 2, 44, 45, 42>::type, numeric_list<int, 42, 43>>::value)); + VERIFY((is_same<typename gen_numeric_list_swapped_pair<int, 5, 44, 45, 42>::type, numeric_list<int, 42, 43, 45, 44, 46>>::value)); + VERIFY((is_same<typename gen_numeric_list_swapped_pair<int, 10, 44, 45, 42>::type, numeric_list<int, 42, 43, 45, 44, 46, 47, 48, 49, 50, 51>>::value)); + + VERIFY((is_same<typename gen_numeric_list_repeated<int, 0, 0>::type, numeric_list<int>>::value)); + VERIFY((is_same<typename gen_numeric_list_repeated<int, 1, 0>::type, numeric_list<int, 0>>::value)); + VERIFY((is_same<typename gen_numeric_list_repeated<int, 2, 0>::type, numeric_list<int, 0, 0>>::value)); + VERIFY((is_same<typename gen_numeric_list_repeated<int, 5, 0>::type, numeric_list<int, 0, 0, 0, 0, 0>>::value)); + VERIFY((is_same<typename gen_numeric_list_repeated<int, 10, 0>::type, numeric_list<int, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0>>::value)); +} + +static void test_concat() +{ + VERIFY((is_same<typename concat<type_list<dummy_a, dummy_a>, type_list<>>::type, type_list<dummy_a, dummy_a>>::value)); + VERIFY((is_same<typename concat<type_list<>, type_list<dummy_a, dummy_a>>::type, type_list<dummy_a, dummy_a>>::value)); + VERIFY((is_same<typename concat<type_list<dummy_a, dummy_a>, type_list<dummy_a, dummy_a>>::type, type_list<dummy_a, dummy_a, dummy_a, dummy_a>>::value)); + VERIFY((is_same<typename concat<type_list<dummy_a, dummy_a>, type_list<dummy_b, dummy_c>>::type, type_list<dummy_a, dummy_a, dummy_b, dummy_c>>::value)); + VERIFY((is_same<typename concat<type_list<dummy_a>, type_list<dummy_b, dummy_c>>::type, type_list<dummy_a, dummy_b, dummy_c>>::value)); + + VERIFY((is_same<typename concat<numeric_list<int, 0, 0>, numeric_list<int>>::type, numeric_list<int, 0, 0>>::value)); + VERIFY((is_same<typename concat<numeric_list<int>, numeric_list<int, 0, 0>>::type, numeric_list<int, 0, 0>>::value)); + VERIFY((is_same<typename concat<numeric_list<int, 0, 0>, numeric_list<int, 0, 0>>::type, numeric_list<int, 0, 0, 0, 0>>::value)); + VERIFY((is_same<typename concat<numeric_list<int, 0, 0>, numeric_list<int, 1, 2>>::type, numeric_list<int, 0, 0, 1, 2>>::value)); + VERIFY((is_same<typename concat<numeric_list<int, 0>, numeric_list<int, 1, 2>>::type, numeric_list<int, 0, 1, 2>>::value)); + + VERIFY((is_same<typename mconcat<type_list<dummy_a>>::type, type_list<dummy_a>>::value)); + VERIFY((is_same<typename mconcat<type_list<dummy_a>, type_list<dummy_b>>::type, type_list<dummy_a, dummy_b>>::value)); + VERIFY((is_same<typename mconcat<type_list<dummy_a>, type_list<dummy_b>, type_list<dummy_c>>::type, type_list<dummy_a, dummy_b, dummy_c>>::value)); + VERIFY((is_same<typename mconcat<type_list<dummy_a>, type_list<dummy_b, dummy_c>>::type, type_list<dummy_a, dummy_b, dummy_c>>::value)); + VERIFY((is_same<typename mconcat<type_list<dummy_a, dummy_b>, type_list<dummy_c>>::type, type_list<dummy_a, dummy_b, dummy_c>>::value)); + + VERIFY((is_same<typename mconcat<numeric_list<int, 0>>::type, numeric_list<int, 0>>::value)); + VERIFY((is_same<typename mconcat<numeric_list<int, 0>, numeric_list<int, 1>>::type, numeric_list<int, 0, 1>>::value)); + VERIFY((is_same<typename mconcat<numeric_list<int, 0>, numeric_list<int, 1>, numeric_list<int, 2>>::type, numeric_list<int, 0, 1, 2>>::value)); + VERIFY((is_same<typename mconcat<numeric_list<int, 0>, numeric_list<int, 1, 2>>::type, numeric_list<int, 0, 1, 2>>::value)); + VERIFY((is_same<typename mconcat<numeric_list<int, 0, 1>, numeric_list<int, 2>>::type, numeric_list<int, 0, 1, 2>>::value)); +} + +static void test_slice() +{ + typedef type_list<dummy_a, dummy_a, dummy_b, dummy_b, dummy_c, dummy_c> tl; + typedef numeric_list<int, 0, 1, 2, 3, 4, 5> il; + + VERIFY((is_same<typename take<0, tl>::type, type_list<>>::value)); + VERIFY((is_same<typename take<1, tl>::type, type_list<dummy_a>>::value)); + VERIFY((is_same<typename take<2, tl>::type, type_list<dummy_a, dummy_a>>::value)); + VERIFY((is_same<typename take<3, tl>::type, type_list<dummy_a, dummy_a, dummy_b>>::value)); + VERIFY((is_same<typename take<4, tl>::type, type_list<dummy_a, dummy_a, dummy_b, dummy_b>>::value)); + VERIFY((is_same<typename take<5, tl>::type, type_list<dummy_a, dummy_a, dummy_b, dummy_b, dummy_c>>::value)); + VERIFY((is_same<typename take<6, tl>::type, type_list<dummy_a, dummy_a, dummy_b, dummy_b, dummy_c, dummy_c>>::value)); + + VERIFY((is_same<typename take<0, il>::type, numeric_list<int>>::value)); + VERIFY((is_same<typename take<1, il>::type, numeric_list<int, 0>>::value)); + VERIFY((is_same<typename take<2, il>::type, numeric_list<int, 0, 1>>::value)); + VERIFY((is_same<typename take<3, il>::type, numeric_list<int, 0, 1, 2>>::value)); + VERIFY((is_same<typename take<4, il>::type, numeric_list<int, 0, 1, 2, 3>>::value)); + VERIFY((is_same<typename take<5, il>::type, numeric_list<int, 0, 1, 2, 3, 4>>::value)); + VERIFY((is_same<typename take<6, il>::type, numeric_list<int, 0, 1, 2, 3, 4, 5>>::value)); + + VERIFY((is_same<typename skip<0, tl>::type, type_list<dummy_a, dummy_a, dummy_b, dummy_b, dummy_c, dummy_c>>::value)); + VERIFY((is_same<typename skip<1, tl>::type, type_list<dummy_a, dummy_b, dummy_b, dummy_c, dummy_c>>::value)); + VERIFY((is_same<typename skip<2, tl>::type, type_list<dummy_b, dummy_b, dummy_c, dummy_c>>::value)); + VERIFY((is_same<typename skip<3, tl>::type, type_list<dummy_b, dummy_c, dummy_c>>::value)); + VERIFY((is_same<typename skip<4, tl>::type, type_list<dummy_c, dummy_c>>::value)); + VERIFY((is_same<typename skip<5, tl>::type, type_list<dummy_c>>::value)); + VERIFY((is_same<typename skip<6, tl>::type, type_list<>>::value)); + + VERIFY((is_same<typename skip<0, il>::type, numeric_list<int, 0, 1, 2, 3, 4, 5>>::value)); + VERIFY((is_same<typename skip<1, il>::type, numeric_list<int, 1, 2, 3, 4, 5>>::value)); + VERIFY((is_same<typename skip<2, il>::type, numeric_list<int, 2, 3, 4, 5>>::value)); + VERIFY((is_same<typename skip<3, il>::type, numeric_list<int, 3, 4, 5>>::value)); + VERIFY((is_same<typename skip<4, il>::type, numeric_list<int, 4, 5>>::value)); + VERIFY((is_same<typename skip<5, il>::type, numeric_list<int, 5>>::value)); + VERIFY((is_same<typename skip<6, il>::type, numeric_list<int>>::value)); + + VERIFY((is_same<typename slice<0, 3, tl>::type, typename take<3, tl>::type>::value)); + VERIFY((is_same<typename slice<0, 3, il>::type, typename take<3, il>::type>::value)); + VERIFY((is_same<typename slice<1, 3, tl>::type, type_list<dummy_a, dummy_b, dummy_b>>::value)); + VERIFY((is_same<typename slice<1, 3, il>::type, numeric_list<int, 1, 2, 3>>::value)); +} + +static void test_get() +{ + typedef type_list<dummy_a, dummy_a, dummy_b, dummy_b, dummy_c, dummy_c> tl; + typedef numeric_list<int, 4, 8, 15, 16, 23, 42> il; + + VERIFY((is_same<typename get<0, tl>::type, dummy_a>::value)); + VERIFY((is_same<typename get<1, tl>::type, dummy_a>::value)); + VERIFY((is_same<typename get<2, tl>::type, dummy_b>::value)); + VERIFY((is_same<typename get<3, tl>::type, dummy_b>::value)); + VERIFY((is_same<typename get<4, tl>::type, dummy_c>::value)); + VERIFY((is_same<typename get<5, tl>::type, dummy_c>::value)); + + VERIFY_IS_EQUAL(((int)get<0, il>::value), 4); + VERIFY_IS_EQUAL(((int)get<1, il>::value), 8); + VERIFY_IS_EQUAL(((int)get<2, il>::value), 15); + VERIFY_IS_EQUAL(((int)get<3, il>::value), 16); + VERIFY_IS_EQUAL(((int)get<4, il>::value), 23); + VERIFY_IS_EQUAL(((int)get<5, il>::value), 42); +} + +static void test_id_helper(dummy_a a, dummy_a b, dummy_a c) +{ + (void)a; + (void)b; + (void)c; +} + +template<int... ii> +static void test_id_numeric() +{ + test_id_helper(typename id_numeric<int, ii, dummy_a>::type()...); +} + +template<typename... tt> +static void test_id_type() +{ + test_id_helper(typename id_type<tt, dummy_a>::type()...); +} + +static void test_id() +{ + // don't call VERIFY here, just assume it works if it compiles + // (otherwise it will complain that it can't find the function) + test_id_numeric<1, 4, 6>(); + test_id_type<dummy_a, dummy_b, dummy_c>(); +} + +static void test_is_same_gf() +{ + VERIFY((!is_same_gf<dummy_a, dummy_b>::value)); + VERIFY((!!is_same_gf<dummy_a, dummy_a>::value)); + VERIFY_IS_EQUAL((!!is_same_gf<dummy_a, dummy_b>::global_flags), false); + VERIFY_IS_EQUAL((!!is_same_gf<dummy_a, dummy_a>::global_flags), false); +} + +static void test_apply_op() +{ + typedef type_list<dummy_a, dummy_b, dummy_c> tl; + VERIFY((!!is_same<typename apply_op_from_left<dummy_op, dummy_a, tl>::type, type_list<dummy_e, dummy_c, dummy_d>>::value)); + VERIFY((!!is_same<typename apply_op_from_right<dummy_op, dummy_a, tl>::type, type_list<dummy_e, dummy_d, dummy_b>>::value)); +} + +static void test_contained_in_list() +{ + typedef type_list<dummy_a, dummy_b, dummy_c> tl; + + VERIFY((!!contained_in_list<is_same, dummy_a, tl>::value)); + VERIFY((!!contained_in_list<is_same, dummy_b, tl>::value)); + VERIFY((!!contained_in_list<is_same, dummy_c, tl>::value)); + VERIFY((!contained_in_list<is_same, dummy_d, tl>::value)); + VERIFY((!contained_in_list<is_same, dummy_e, tl>::value)); + + VERIFY((!!contained_in_list_gf<dummy_test, dummy_a, tl>::value)); + VERIFY((!!contained_in_list_gf<dummy_test, dummy_b, tl>::value)); + VERIFY((!!contained_in_list_gf<dummy_test, dummy_c, tl>::value)); + VERIFY((!contained_in_list_gf<dummy_test, dummy_d, tl>::value)); + VERIFY((!contained_in_list_gf<dummy_test, dummy_e, tl>::value)); + + VERIFY_IS_EQUAL(((int)contained_in_list_gf<dummy_test, dummy_a, tl>::global_flags), 1); + VERIFY_IS_EQUAL(((int)contained_in_list_gf<dummy_test, dummy_b, tl>::global_flags), 2); + VERIFY_IS_EQUAL(((int)contained_in_list_gf<dummy_test, dummy_c, tl>::global_flags), 4); + VERIFY_IS_EQUAL(((int)contained_in_list_gf<dummy_test, dummy_d, tl>::global_flags), 0); + VERIFY_IS_EQUAL(((int)contained_in_list_gf<dummy_test, dummy_e, tl>::global_flags), 0); +} + +static void test_arg_reductions() +{ + VERIFY_IS_EQUAL(arg_sum(1,2,3,4), 10); + VERIFY_IS_EQUAL(arg_prod(1,2,3,4), 24); + VERIFY_IS_APPROX(arg_sum(0.5, 2, 5), 7.5); + VERIFY_IS_APPROX(arg_prod(0.5, 2, 5), 5.0); +} + +static void test_array_reverse_and_reduce() +{ + array<int, 6> a{{4, 8, 15, 16, 23, 42}}; + array<int, 6> b{{42, 23, 16, 15, 8, 4}}; + + // there is no operator<< for std::array, so VERIFY_IS_EQUAL will + // not compile + VERIFY((array_reverse(a) == b)); + VERIFY((array_reverse(b) == a)); + VERIFY_IS_EQUAL((array_sum(a)), 108); + VERIFY_IS_EQUAL((array_sum(b)), 108); + VERIFY_IS_EQUAL((array_prod(a)), 7418880); + VERIFY_IS_EQUAL((array_prod(b)), 7418880); +} + +static void test_array_zip_and_apply() +{ + array<int, 6> a{{4, 8, 15, 16, 23, 42}}; + array<int, 6> b{{0, 1, 2, 3, 4, 5}}; + array<int, 6> c{{4, 9, 17, 19, 27, 47}}; + array<int, 6> d{{0, 8, 30, 48, 92, 210}}; + array<int, 6> e{{0, 2, 4, 6, 8, 10}}; + + VERIFY((array_zip<sum_op>(a, b) == c)); + VERIFY((array_zip<product_op>(a, b) == d)); + VERIFY((array_apply<times2_op>(b) == e)); + VERIFY_IS_EQUAL((array_apply_and_reduce<sum_op, times2_op>(a)), 216); + VERIFY_IS_EQUAL((array_apply_and_reduce<sum_op, times2_op>(b)), 30); + VERIFY_IS_EQUAL((array_zip_and_reduce<product_op, sum_op>(a, b)), 14755932); + VERIFY_IS_EQUAL((array_zip_and_reduce<sum_op, product_op>(a, b)), 388); +} + +static void test_array_misc() +{ + array<int, 3> a3{{1, 1, 1}}; + array<int, 6> a6{{2, 2, 2, 2, 2, 2}}; + VERIFY((repeat<3, int>(1) == a3)); + VERIFY((repeat<6, int>(2) == a6)); + + int data[5] = { 0, 1, 2, 3, 4 }; + VERIFY_IS_EQUAL((instantiate_by_c_array<dummy_inst, int, 0>(data).c), 0); + VERIFY_IS_EQUAL((instantiate_by_c_array<dummy_inst, int, 1>(data).c), 1); + VERIFY_IS_EQUAL((instantiate_by_c_array<dummy_inst, int, 2>(data).c), 2); + VERIFY_IS_EQUAL((instantiate_by_c_array<dummy_inst, int, 3>(data).c), 3); + VERIFY_IS_EQUAL((instantiate_by_c_array<dummy_inst, int, 4>(data).c), 4); + VERIFY_IS_EQUAL((instantiate_by_c_array<dummy_inst, int, 5>(data).c), 5); +} + +EIGEN_DECLARE_TEST(cxx11_meta) +{ + CALL_SUBTEST(test_gen_numeric_list()); + CALL_SUBTEST(test_concat()); + CALL_SUBTEST(test_slice()); + CALL_SUBTEST(test_get()); + CALL_SUBTEST(test_id()); + CALL_SUBTEST(test_is_same_gf()); + CALL_SUBTEST(test_apply_op()); + CALL_SUBTEST(test_contained_in_list()); + CALL_SUBTEST(test_arg_reductions()); + CALL_SUBTEST(test_array_reverse_and_reduce()); + CALL_SUBTEST(test_array_zip_and_apply()); + CALL_SUBTEST(test_array_misc()); +}
diff --git a/unsupported/test/cxx11_eventcount.cpp b/test/threads_eventcount.cpp similarity index 98% rename from unsupported/test/cxx11_eventcount.cpp rename to test/threads_eventcount.cpp index 714540e..76fab31 100644 --- a/unsupported/test/cxx11_eventcount.cpp +++ b/test/threads_eventcount.cpp
@@ -10,7 +10,7 @@ #define EIGEN_USE_THREADS #include "main.h" -#include <Eigen/CXX11/ThreadPool> +#include <Eigen/ThreadPool> // Visual studio doesn't implement a rand_r() function since its // implementation of rand() is already thread safe
diff --git a/unsupported/test/cxx11_non_blocking_thread_pool.cpp b/test/threads_non_blocking_thread_pool.cpp similarity index 98% rename from unsupported/test/cxx11_non_blocking_thread_pool.cpp rename to test/threads_non_blocking_thread_pool.cpp index 993ee17..25ba96c 100644 --- a/unsupported/test/cxx11_non_blocking_thread_pool.cpp +++ b/test/threads_non_blocking_thread_pool.cpp
@@ -10,8 +10,7 @@ #define EIGEN_USE_THREADS #include "main.h" -#include "Eigen/CXX11/ThreadPool" -#include "Eigen/CXX11/Tensor" +#include "Eigen/ThreadPool" static void test_create_destroy_empty_pool() {
diff --git a/unsupported/test/cxx11_runqueue.cpp b/test/threads_runqueue.cpp similarity index 98% rename from unsupported/test/cxx11_runqueue.cpp rename to test/threads_runqueue.cpp index 0f7f13b..99668e7 100644 --- a/unsupported/test/cxx11_runqueue.cpp +++ b/test/threads_runqueue.cpp
@@ -11,7 +11,7 @@ #define EIGEN_USE_THREADS #include <cstdlib> #include "main.h" -#include <Eigen/CXX11/ThreadPool> +#include <Eigen/ThreadPool> // Visual studio doesn't implement a rand_r() function since its
diff --git a/unsupported/Eigen/CXX11/Tensor b/unsupported/Eigen/CXX11/Tensor index 98e0918..5b1c48e 100644 --- a/unsupported/Eigen/CXX11/Tensor +++ b/unsupported/Eigen/CXX11/Tensor
@@ -18,8 +18,8 @@ #include "../../../Eigen/src/Core/util/DisableStupidWarnings.h" // IWYU pragma: begin_exports -#include "src/util/CXX11Meta.h" -#include "src/util/MaxSizeVector.h" +#include "src/Core/util/Meta.h" +#include "src/Core/util/MaxSizeVector.h" // IWYU pragma: end_exports /** \defgroup CXX11_Tensor_Module Tensor Module
diff --git a/unsupported/Eigen/CXX11/ThreadPool b/unsupported/Eigen/CXX11/ThreadPool index 041ba07..9cdf2c0 100644 --- a/unsupported/Eigen/CXX11/ThreadPool +++ b/unsupported/Eigen/CXX11/ThreadPool
@@ -1,73 +1 @@ -// This file is part of Eigen, a lightweight C++ template library -// for linear algebra. -// -// Copyright (C) 2016 Benoit Steiner <benoit.steiner.goog@gmail.com> -// -// This Source Code Form is subject to the terms of the Mozilla -// Public License v. 2.0. If a copy of the MPL was not distributed -// with this file, You can obtain one at http://mozilla.org/MPL/2.0/. - -#ifndef EIGEN_CXX11_THREADPOOL_MODULE_H -#define EIGEN_CXX11_THREADPOOL_MODULE_H - -#include "../../../Eigen/Core" - -#include "../../../Eigen/src/Core/util/DisableStupidWarnings.h" - -/** \defgroup CXX11_ThreadPool_Module C++11 ThreadPool Module - * - * This module provides 2 threadpool implementations - * - a simple reference implementation - * - a faster non blocking implementation - * - * This module requires C++11. - * - * \code - * #include <Eigen/CXX11/ThreadPool> - * \endcode - */ - - -// The code depends on CXX11, so only include the module if the -// compiler supports it. -#include <cstddef> -#include <cstring> -#include <time.h> - -#include <vector> -#include <atomic> -#include <condition_variable> -#include <deque> -#include <mutex> -#include <thread> -#include <functional> -#include <memory> -#include <utility> - -// There are non-parenthesized calls to "max" in the <unordered_map> header, -// which trigger a check in test/main.h causing compilation to fail. -// We work around the check here by removing the check for max in -// the case where we have to emulate thread_local. -#ifdef max -#undef max -#endif -#include <unordered_map> - -#include "src/util/CXX11Meta.h" -#include "src/util/MaxSizeVector.h" - -// IWYU pragma: begin_exports -#include "src/ThreadPool/ThreadLocal.h" -#include "src/ThreadPool/ThreadYield.h" -#include "src/ThreadPool/ThreadCancel.h" -#include "src/ThreadPool/EventCount.h" -#include "src/ThreadPool/RunQueue.h" -#include "src/ThreadPool/ThreadPoolInterface.h" -#include "src/ThreadPool/ThreadEnvironment.h" -#include "src/ThreadPool/Barrier.h" -#include "src/ThreadPool/NonBlockingThreadPool.h" -// IWYU pragma: end_exports - -#include "../../../Eigen/src/Core/util/ReenableStupidWarnings.h" - -#endif // EIGEN_CXX11_THREADPOOL_MODULE_H +#include "../../../Eigen/ThreadPool" \ No newline at end of file
diff --git a/unsupported/test/CMakeLists.txt b/unsupported/test/CMakeLists.txt index 45cc4a3..cd97756 100644 --- a/unsupported/test/CMakeLists.txt +++ b/unsupported/test/CMakeLists.txt
@@ -223,12 +223,6 @@ set(EIGEN_SYCL OFF) endif() -ei_add_test(cxx11_eventcount "-pthread" "${CMAKE_THREAD_LIBS_INIT}") -ei_add_test(cxx11_runqueue "-pthread" "${CMAKE_THREAD_LIBS_INIT}") -ei_add_test(cxx11_non_blocking_thread_pool "-pthread" "${CMAKE_THREAD_LIBS_INIT}") - -ei_add_test(cxx11_meta) -ei_add_test(cxx11_maxsizevector) ei_add_test(cxx11_tensor_argmax) ei_add_test(cxx11_tensor_assign) ei_add_test(cxx11_tensor_block_access)
diff --git a/unsupported/test/cxx11_meta.cpp b/unsupported/test/cxx11_meta.cpp deleted file mode 100644 index 510e110..0000000 --- a/unsupported/test/cxx11_meta.cpp +++ /dev/null
@@ -1,357 +0,0 @@ -// This file is part of Eigen, a lightweight C++ template library -// for linear algebra. -// -// Copyright (C) 2013 Christian Seiler <christian@iwakd.de> -// -// This Source Code Form is subject to the terms of the Mozilla -// Public License v. 2.0. If a copy of the MPL was not distributed -// with this file, You can obtain one at http://mozilla.org/MPL/2.0/. - -#include "main.h" - -#include <array> -#include <Eigen/CXX11/src/util/CXX11Meta.h> - -using Eigen::internal::is_same; -using Eigen::internal::type_list; -using Eigen::internal::numeric_list; -using Eigen::internal::gen_numeric_list; -using Eigen::internal::gen_numeric_list_reversed; -using Eigen::internal::gen_numeric_list_swapped_pair; -using Eigen::internal::gen_numeric_list_repeated; -using Eigen::internal::concat; -using Eigen::internal::mconcat; -using Eigen::internal::take; -using Eigen::internal::skip; -using Eigen::internal::slice; -using Eigen::internal::get; -using Eigen::internal::id_numeric; -using Eigen::internal::id_type; -using Eigen::internal::is_same_gf; -using Eigen::internal::apply_op_from_left; -using Eigen::internal::apply_op_from_right; -using Eigen::internal::contained_in_list; -using Eigen::internal::contained_in_list_gf; -using Eigen::internal::arg_prod; -using Eigen::internal::arg_sum; -using Eigen::internal::sum_op; -using Eigen::internal::product_op; -using Eigen::internal::array_reverse; -using Eigen::internal::array_sum; -using Eigen::internal::array_prod; -using Eigen::internal::array_reduce; -using Eigen::internal::array_zip; -using Eigen::internal::array_zip_and_reduce; -using Eigen::internal::array_apply; -using Eigen::internal::array_apply_and_reduce; -using Eigen::internal::repeat; -using Eigen::internal::instantiate_by_c_array; - -struct dummy_a {}; -struct dummy_b {}; -struct dummy_c {}; -struct dummy_d {}; -struct dummy_e {}; - -// dummy operation for testing apply -template<typename A, typename B> struct dummy_op; -template<> struct dummy_op<dummy_a, dummy_b> { typedef dummy_c type; }; -template<> struct dummy_op<dummy_b, dummy_a> { typedef dummy_d type; }; -template<> struct dummy_op<dummy_b, dummy_c> { typedef dummy_a type; }; -template<> struct dummy_op<dummy_c, dummy_b> { typedef dummy_d type; }; -template<> struct dummy_op<dummy_c, dummy_a> { typedef dummy_b type; }; -template<> struct dummy_op<dummy_a, dummy_c> { typedef dummy_d type; }; -template<> struct dummy_op<dummy_a, dummy_a> { typedef dummy_e type; }; -template<> struct dummy_op<dummy_b, dummy_b> { typedef dummy_e type; }; -template<> struct dummy_op<dummy_c, dummy_c> { typedef dummy_e type; }; - -template<typename A, typename B> struct dummy_test { constexpr static bool value = false; constexpr static int global_flags = 0; }; -template<> struct dummy_test<dummy_a, dummy_a> { constexpr static bool value = true; constexpr static int global_flags = 1; }; -template<> struct dummy_test<dummy_b, dummy_b> { constexpr static bool value = true; constexpr static int global_flags = 2; }; -template<> struct dummy_test<dummy_c, dummy_c> { constexpr static bool value = true; constexpr static int global_flags = 4; }; - -struct times2_op { template<typename A> static A run(A v) { return v * 2; } }; - -struct dummy_inst -{ - int c; - - dummy_inst() : c(0) {} - explicit dummy_inst(int) : c(1) {} - dummy_inst(int, int) : c(2) {} - dummy_inst(int, int, int) : c(3) {} - dummy_inst(int, int, int, int) : c(4) {} - dummy_inst(int, int, int, int, int) : c(5) {} -}; - -static void test_gen_numeric_list() -{ - VERIFY((is_same<typename gen_numeric_list<int, 0>::type, numeric_list<int>>::value)); - VERIFY((is_same<typename gen_numeric_list<int, 1>::type, numeric_list<int, 0>>::value)); - VERIFY((is_same<typename gen_numeric_list<int, 2>::type, numeric_list<int, 0, 1>>::value)); - VERIFY((is_same<typename gen_numeric_list<int, 5>::type, numeric_list<int, 0, 1, 2, 3, 4>>::value)); - VERIFY((is_same<typename gen_numeric_list<int, 10>::type, numeric_list<int, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9>>::value)); - - VERIFY((is_same<typename gen_numeric_list<int, 0, 42>::type, numeric_list<int>>::value)); - VERIFY((is_same<typename gen_numeric_list<int, 1, 42>::type, numeric_list<int, 42>>::value)); - VERIFY((is_same<typename gen_numeric_list<int, 2, 42>::type, numeric_list<int, 42, 43>>::value)); - VERIFY((is_same<typename gen_numeric_list<int, 5, 42>::type, numeric_list<int, 42, 43, 44, 45, 46>>::value)); - VERIFY((is_same<typename gen_numeric_list<int, 10, 42>::type, numeric_list<int, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51>>::value)); - - VERIFY((is_same<typename gen_numeric_list_reversed<int, 0>::type, numeric_list<int>>::value)); - VERIFY((is_same<typename gen_numeric_list_reversed<int, 1>::type, numeric_list<int, 0>>::value)); - VERIFY((is_same<typename gen_numeric_list_reversed<int, 2>::type, numeric_list<int, 1, 0>>::value)); - VERIFY((is_same<typename gen_numeric_list_reversed<int, 5>::type, numeric_list<int, 4, 3, 2, 1, 0>>::value)); - VERIFY((is_same<typename gen_numeric_list_reversed<int, 10>::type, numeric_list<int, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0>>::value)); - - VERIFY((is_same<typename gen_numeric_list_reversed<int, 0, 42>::type, numeric_list<int>>::value)); - VERIFY((is_same<typename gen_numeric_list_reversed<int, 1, 42>::type, numeric_list<int, 42>>::value)); - VERIFY((is_same<typename gen_numeric_list_reversed<int, 2, 42>::type, numeric_list<int, 43, 42>>::value)); - VERIFY((is_same<typename gen_numeric_list_reversed<int, 5, 42>::type, numeric_list<int, 46, 45, 44, 43, 42>>::value)); - VERIFY((is_same<typename gen_numeric_list_reversed<int, 10, 42>::type, numeric_list<int, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42>>::value)); - - VERIFY((is_same<typename gen_numeric_list_swapped_pair<int, 0, 2, 3>::type, numeric_list<int>>::value)); - VERIFY((is_same<typename gen_numeric_list_swapped_pair<int, 1, 2, 3>::type, numeric_list<int, 0>>::value)); - VERIFY((is_same<typename gen_numeric_list_swapped_pair<int, 2, 2, 3>::type, numeric_list<int, 0, 1>>::value)); - VERIFY((is_same<typename gen_numeric_list_swapped_pair<int, 5, 2, 3>::type, numeric_list<int, 0, 1, 3, 2, 4>>::value)); - VERIFY((is_same<typename gen_numeric_list_swapped_pair<int, 10, 2, 3>::type, numeric_list<int, 0, 1, 3, 2, 4, 5, 6, 7, 8, 9>>::value)); - - VERIFY((is_same<typename gen_numeric_list_swapped_pair<int, 0, 44, 45, 42>::type, numeric_list<int>>::value)); - VERIFY((is_same<typename gen_numeric_list_swapped_pair<int, 1, 44, 45, 42>::type, numeric_list<int, 42>>::value)); - VERIFY((is_same<typename gen_numeric_list_swapped_pair<int, 2, 44, 45, 42>::type, numeric_list<int, 42, 43>>::value)); - VERIFY((is_same<typename gen_numeric_list_swapped_pair<int, 5, 44, 45, 42>::type, numeric_list<int, 42, 43, 45, 44, 46>>::value)); - VERIFY((is_same<typename gen_numeric_list_swapped_pair<int, 10, 44, 45, 42>::type, numeric_list<int, 42, 43, 45, 44, 46, 47, 48, 49, 50, 51>>::value)); - - VERIFY((is_same<typename gen_numeric_list_repeated<int, 0, 0>::type, numeric_list<int>>::value)); - VERIFY((is_same<typename gen_numeric_list_repeated<int, 1, 0>::type, numeric_list<int, 0>>::value)); - VERIFY((is_same<typename gen_numeric_list_repeated<int, 2, 0>::type, numeric_list<int, 0, 0>>::value)); - VERIFY((is_same<typename gen_numeric_list_repeated<int, 5, 0>::type, numeric_list<int, 0, 0, 0, 0, 0>>::value)); - VERIFY((is_same<typename gen_numeric_list_repeated<int, 10, 0>::type, numeric_list<int, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0>>::value)); -} - -static void test_concat() -{ - VERIFY((is_same<typename concat<type_list<dummy_a, dummy_a>, type_list<>>::type, type_list<dummy_a, dummy_a>>::value)); - VERIFY((is_same<typename concat<type_list<>, type_list<dummy_a, dummy_a>>::type, type_list<dummy_a, dummy_a>>::value)); - VERIFY((is_same<typename concat<type_list<dummy_a, dummy_a>, type_list<dummy_a, dummy_a>>::type, type_list<dummy_a, dummy_a, dummy_a, dummy_a>>::value)); - VERIFY((is_same<typename concat<type_list<dummy_a, dummy_a>, type_list<dummy_b, dummy_c>>::type, type_list<dummy_a, dummy_a, dummy_b, dummy_c>>::value)); - VERIFY((is_same<typename concat<type_list<dummy_a>, type_list<dummy_b, dummy_c>>::type, type_list<dummy_a, dummy_b, dummy_c>>::value)); - - VERIFY((is_same<typename concat<numeric_list<int, 0, 0>, numeric_list<int>>::type, numeric_list<int, 0, 0>>::value)); - VERIFY((is_same<typename concat<numeric_list<int>, numeric_list<int, 0, 0>>::type, numeric_list<int, 0, 0>>::value)); - VERIFY((is_same<typename concat<numeric_list<int, 0, 0>, numeric_list<int, 0, 0>>::type, numeric_list<int, 0, 0, 0, 0>>::value)); - VERIFY((is_same<typename concat<numeric_list<int, 0, 0>, numeric_list<int, 1, 2>>::type, numeric_list<int, 0, 0, 1, 2>>::value)); - VERIFY((is_same<typename concat<numeric_list<int, 0>, numeric_list<int, 1, 2>>::type, numeric_list<int, 0, 1, 2>>::value)); - - VERIFY((is_same<typename mconcat<type_list<dummy_a>>::type, type_list<dummy_a>>::value)); - VERIFY((is_same<typename mconcat<type_list<dummy_a>, type_list<dummy_b>>::type, type_list<dummy_a, dummy_b>>::value)); - VERIFY((is_same<typename mconcat<type_list<dummy_a>, type_list<dummy_b>, type_list<dummy_c>>::type, type_list<dummy_a, dummy_b, dummy_c>>::value)); - VERIFY((is_same<typename mconcat<type_list<dummy_a>, type_list<dummy_b, dummy_c>>::type, type_list<dummy_a, dummy_b, dummy_c>>::value)); - VERIFY((is_same<typename mconcat<type_list<dummy_a, dummy_b>, type_list<dummy_c>>::type, type_list<dummy_a, dummy_b, dummy_c>>::value)); - - VERIFY((is_same<typename mconcat<numeric_list<int, 0>>::type, numeric_list<int, 0>>::value)); - VERIFY((is_same<typename mconcat<numeric_list<int, 0>, numeric_list<int, 1>>::type, numeric_list<int, 0, 1>>::value)); - VERIFY((is_same<typename mconcat<numeric_list<int, 0>, numeric_list<int, 1>, numeric_list<int, 2>>::type, numeric_list<int, 0, 1, 2>>::value)); - VERIFY((is_same<typename mconcat<numeric_list<int, 0>, numeric_list<int, 1, 2>>::type, numeric_list<int, 0, 1, 2>>::value)); - VERIFY((is_same<typename mconcat<numeric_list<int, 0, 1>, numeric_list<int, 2>>::type, numeric_list<int, 0, 1, 2>>::value)); -} - -static void test_slice() -{ - typedef type_list<dummy_a, dummy_a, dummy_b, dummy_b, dummy_c, dummy_c> tl; - typedef numeric_list<int, 0, 1, 2, 3, 4, 5> il; - - VERIFY((is_same<typename take<0, tl>::type, type_list<>>::value)); - VERIFY((is_same<typename take<1, tl>::type, type_list<dummy_a>>::value)); - VERIFY((is_same<typename take<2, tl>::type, type_list<dummy_a, dummy_a>>::value)); - VERIFY((is_same<typename take<3, tl>::type, type_list<dummy_a, dummy_a, dummy_b>>::value)); - VERIFY((is_same<typename take<4, tl>::type, type_list<dummy_a, dummy_a, dummy_b, dummy_b>>::value)); - VERIFY((is_same<typename take<5, tl>::type, type_list<dummy_a, dummy_a, dummy_b, dummy_b, dummy_c>>::value)); - VERIFY((is_same<typename take<6, tl>::type, type_list<dummy_a, dummy_a, dummy_b, dummy_b, dummy_c, dummy_c>>::value)); - - VERIFY((is_same<typename take<0, il>::type, numeric_list<int>>::value)); - VERIFY((is_same<typename take<1, il>::type, numeric_list<int, 0>>::value)); - VERIFY((is_same<typename take<2, il>::type, numeric_list<int, 0, 1>>::value)); - VERIFY((is_same<typename take<3, il>::type, numeric_list<int, 0, 1, 2>>::value)); - VERIFY((is_same<typename take<4, il>::type, numeric_list<int, 0, 1, 2, 3>>::value)); - VERIFY((is_same<typename take<5, il>::type, numeric_list<int, 0, 1, 2, 3, 4>>::value)); - VERIFY((is_same<typename take<6, il>::type, numeric_list<int, 0, 1, 2, 3, 4, 5>>::value)); - - VERIFY((is_same<typename skip<0, tl>::type, type_list<dummy_a, dummy_a, dummy_b, dummy_b, dummy_c, dummy_c>>::value)); - VERIFY((is_same<typename skip<1, tl>::type, type_list<dummy_a, dummy_b, dummy_b, dummy_c, dummy_c>>::value)); - VERIFY((is_same<typename skip<2, tl>::type, type_list<dummy_b, dummy_b, dummy_c, dummy_c>>::value)); - VERIFY((is_same<typename skip<3, tl>::type, type_list<dummy_b, dummy_c, dummy_c>>::value)); - VERIFY((is_same<typename skip<4, tl>::type, type_list<dummy_c, dummy_c>>::value)); - VERIFY((is_same<typename skip<5, tl>::type, type_list<dummy_c>>::value)); - VERIFY((is_same<typename skip<6, tl>::type, type_list<>>::value)); - - VERIFY((is_same<typename skip<0, il>::type, numeric_list<int, 0, 1, 2, 3, 4, 5>>::value)); - VERIFY((is_same<typename skip<1, il>::type, numeric_list<int, 1, 2, 3, 4, 5>>::value)); - VERIFY((is_same<typename skip<2, il>::type, numeric_list<int, 2, 3, 4, 5>>::value)); - VERIFY((is_same<typename skip<3, il>::type, numeric_list<int, 3, 4, 5>>::value)); - VERIFY((is_same<typename skip<4, il>::type, numeric_list<int, 4, 5>>::value)); - VERIFY((is_same<typename skip<5, il>::type, numeric_list<int, 5>>::value)); - VERIFY((is_same<typename skip<6, il>::type, numeric_list<int>>::value)); - - VERIFY((is_same<typename slice<0, 3, tl>::type, typename take<3, tl>::type>::value)); - VERIFY((is_same<typename slice<0, 3, il>::type, typename take<3, il>::type>::value)); - VERIFY((is_same<typename slice<1, 3, tl>::type, type_list<dummy_a, dummy_b, dummy_b>>::value)); - VERIFY((is_same<typename slice<1, 3, il>::type, numeric_list<int, 1, 2, 3>>::value)); -} - -static void test_get() -{ - typedef type_list<dummy_a, dummy_a, dummy_b, dummy_b, dummy_c, dummy_c> tl; - typedef numeric_list<int, 4, 8, 15, 16, 23, 42> il; - - VERIFY((is_same<typename get<0, tl>::type, dummy_a>::value)); - VERIFY((is_same<typename get<1, tl>::type, dummy_a>::value)); - VERIFY((is_same<typename get<2, tl>::type, dummy_b>::value)); - VERIFY((is_same<typename get<3, tl>::type, dummy_b>::value)); - VERIFY((is_same<typename get<4, tl>::type, dummy_c>::value)); - VERIFY((is_same<typename get<5, tl>::type, dummy_c>::value)); - - VERIFY_IS_EQUAL(((int)get<0, il>::value), 4); - VERIFY_IS_EQUAL(((int)get<1, il>::value), 8); - VERIFY_IS_EQUAL(((int)get<2, il>::value), 15); - VERIFY_IS_EQUAL(((int)get<3, il>::value), 16); - VERIFY_IS_EQUAL(((int)get<4, il>::value), 23); - VERIFY_IS_EQUAL(((int)get<5, il>::value), 42); -} - -static void test_id_helper(dummy_a a, dummy_a b, dummy_a c) -{ - (void)a; - (void)b; - (void)c; -} - -template<int... ii> -static void test_id_numeric() -{ - test_id_helper(typename id_numeric<int, ii, dummy_a>::type()...); -} - -template<typename... tt> -static void test_id_type() -{ - test_id_helper(typename id_type<tt, dummy_a>::type()...); -} - -static void test_id() -{ - // don't call VERIFY here, just assume it works if it compiles - // (otherwise it will complain that it can't find the function) - test_id_numeric<1, 4, 6>(); - test_id_type<dummy_a, dummy_b, dummy_c>(); -} - -static void test_is_same_gf() -{ - VERIFY((!is_same_gf<dummy_a, dummy_b>::value)); - VERIFY((!!is_same_gf<dummy_a, dummy_a>::value)); - VERIFY_IS_EQUAL((!!is_same_gf<dummy_a, dummy_b>::global_flags), false); - VERIFY_IS_EQUAL((!!is_same_gf<dummy_a, dummy_a>::global_flags), false); -} - -static void test_apply_op() -{ - typedef type_list<dummy_a, dummy_b, dummy_c> tl; - VERIFY((!!is_same<typename apply_op_from_left<dummy_op, dummy_a, tl>::type, type_list<dummy_e, dummy_c, dummy_d>>::value)); - VERIFY((!!is_same<typename apply_op_from_right<dummy_op, dummy_a, tl>::type, type_list<dummy_e, dummy_d, dummy_b>>::value)); -} - -static void test_contained_in_list() -{ - typedef type_list<dummy_a, dummy_b, dummy_c> tl; - - VERIFY((!!contained_in_list<is_same, dummy_a, tl>::value)); - VERIFY((!!contained_in_list<is_same, dummy_b, tl>::value)); - VERIFY((!!contained_in_list<is_same, dummy_c, tl>::value)); - VERIFY((!contained_in_list<is_same, dummy_d, tl>::value)); - VERIFY((!contained_in_list<is_same, dummy_e, tl>::value)); - - VERIFY((!!contained_in_list_gf<dummy_test, dummy_a, tl>::value)); - VERIFY((!!contained_in_list_gf<dummy_test, dummy_b, tl>::value)); - VERIFY((!!contained_in_list_gf<dummy_test, dummy_c, tl>::value)); - VERIFY((!contained_in_list_gf<dummy_test, dummy_d, tl>::value)); - VERIFY((!contained_in_list_gf<dummy_test, dummy_e, tl>::value)); - - VERIFY_IS_EQUAL(((int)contained_in_list_gf<dummy_test, dummy_a, tl>::global_flags), 1); - VERIFY_IS_EQUAL(((int)contained_in_list_gf<dummy_test, dummy_b, tl>::global_flags), 2); - VERIFY_IS_EQUAL(((int)contained_in_list_gf<dummy_test, dummy_c, tl>::global_flags), 4); - VERIFY_IS_EQUAL(((int)contained_in_list_gf<dummy_test, dummy_d, tl>::global_flags), 0); - VERIFY_IS_EQUAL(((int)contained_in_list_gf<dummy_test, dummy_e, tl>::global_flags), 0); -} - -static void test_arg_reductions() -{ - VERIFY_IS_EQUAL(arg_sum(1,2,3,4), 10); - VERIFY_IS_EQUAL(arg_prod(1,2,3,4), 24); - VERIFY_IS_APPROX(arg_sum(0.5, 2, 5), 7.5); - VERIFY_IS_APPROX(arg_prod(0.5, 2, 5), 5.0); -} - -static void test_array_reverse_and_reduce() -{ - array<int, 6> a{{4, 8, 15, 16, 23, 42}}; - array<int, 6> b{{42, 23, 16, 15, 8, 4}}; - - // there is no operator<< for std::array, so VERIFY_IS_EQUAL will - // not compile - VERIFY((array_reverse(a) == b)); - VERIFY((array_reverse(b) == a)); - VERIFY_IS_EQUAL((array_sum(a)), 108); - VERIFY_IS_EQUAL((array_sum(b)), 108); - VERIFY_IS_EQUAL((array_prod(a)), 7418880); - VERIFY_IS_EQUAL((array_prod(b)), 7418880); -} - -static void test_array_zip_and_apply() -{ - array<int, 6> a{{4, 8, 15, 16, 23, 42}}; - array<int, 6> b{{0, 1, 2, 3, 4, 5}}; - array<int, 6> c{{4, 9, 17, 19, 27, 47}}; - array<int, 6> d{{0, 8, 30, 48, 92, 210}}; - array<int, 6> e{{0, 2, 4, 6, 8, 10}}; - - VERIFY((array_zip<sum_op>(a, b) == c)); - VERIFY((array_zip<product_op>(a, b) == d)); - VERIFY((array_apply<times2_op>(b) == e)); - VERIFY_IS_EQUAL((array_apply_and_reduce<sum_op, times2_op>(a)), 216); - VERIFY_IS_EQUAL((array_apply_and_reduce<sum_op, times2_op>(b)), 30); - VERIFY_IS_EQUAL((array_zip_and_reduce<product_op, sum_op>(a, b)), 14755932); - VERIFY_IS_EQUAL((array_zip_and_reduce<sum_op, product_op>(a, b)), 388); -} - -static void test_array_misc() -{ - array<int, 3> a3{{1, 1, 1}}; - array<int, 6> a6{{2, 2, 2, 2, 2, 2}}; - VERIFY((repeat<3, int>(1) == a3)); - VERIFY((repeat<6, int>(2) == a6)); - - int data[5] = { 0, 1, 2, 3, 4 }; - VERIFY_IS_EQUAL((instantiate_by_c_array<dummy_inst, int, 0>(data).c), 0); - VERIFY_IS_EQUAL((instantiate_by_c_array<dummy_inst, int, 1>(data).c), 1); - VERIFY_IS_EQUAL((instantiate_by_c_array<dummy_inst, int, 2>(data).c), 2); - VERIFY_IS_EQUAL((instantiate_by_c_array<dummy_inst, int, 3>(data).c), 3); - VERIFY_IS_EQUAL((instantiate_by_c_array<dummy_inst, int, 4>(data).c), 4); - VERIFY_IS_EQUAL((instantiate_by_c_array<dummy_inst, int, 5>(data).c), 5); -} - -EIGEN_DECLARE_TEST(cxx11_meta) -{ - CALL_SUBTEST(test_gen_numeric_list()); - CALL_SUBTEST(test_concat()); - CALL_SUBTEST(test_slice()); - CALL_SUBTEST(test_get()); - CALL_SUBTEST(test_id()); - CALL_SUBTEST(test_is_same_gf()); - CALL_SUBTEST(test_apply_op()); - CALL_SUBTEST(test_contained_in_list()); - CALL_SUBTEST(test_arg_reductions()); - CALL_SUBTEST(test_array_reverse_and_reduce()); - CALL_SUBTEST(test_array_zip_and_apply()); - CALL_SUBTEST(test_array_misc()); -}
diff --git a/unsupported/test/cxx11_tensor_thread_local.cpp b/unsupported/test/cxx11_tensor_thread_local.cpp index 7e866f6..ec9d9ca 100644 --- a/unsupported/test/cxx11_tensor_thread_local.cpp +++ b/unsupported/test/cxx11_tensor_thread_local.cpp
@@ -11,7 +11,7 @@ #include <unordered_set> #include "main.h" -#include <Eigen/CXX11/ThreadPool> +#include <Eigen/ThreadPool> struct Counter { Counter() = default;