mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2024-12-27 07:29:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix tuple_test after gpu_test_helper update.

Browse Source 
Duplicating the namespace `tuple_impl` caused a conflict with the
`arch/GPU/Tuple.h` definitions for the `tuple_test`.  We can't
just use `Eigen::internal` either, since there exists a different
`Eigen::internal::get`.  Renaming the namespace to `test_detail`
fixes the issue.
This commit is contained in:
Antonio Sanchez 2021-09-11 20:24:42 -07:00
parent d06c639667
commit 2e31570c16
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
test/gpu_test_helper.h
View File

@ -25,19 +25,24 @@
namespace Eigen { namespace Eigen {
namespace internal { namespace internal {
namespace tuple_impl {
// Note: cannot re-use tuple_impl, since that will cause havoc for
// tuple_test.
namespace test_detail {
// Use std::tuple on CPU, otherwise use the GPU-specific versions. // Use std::tuple on CPU, otherwise use the GPU-specific versions.
#if !EIGEN_USE_CUSTOM_TUPLE #if !EIGEN_USE_CUSTOM_TUPLE
using std::tuple; using std::tuple;
using std::get; using std::get;
using std::make_tuple; using std::make_tuple;
using std::tie; using std::tie;
#else
using tuple_impl::tuple;
using tuple_impl::get;
using tuple_impl::make_tuple;
using
#endif #endif
#undef EIGEN_USE_CUSTOM_TUPLE #undef EIGEN_USE_CUSTOM_TUPLE
} // namespace test_detail
}
template<size_t N, size_t Idx, typename OutputIndexSequence, typename... Ts> template<size_t N, size_t Idx, typename OutputIndexSequence, typename... Ts>
struct extract_output_indices_helper; struct extract_output_indices_helper;
@ -131,9 +136,9 @@ template<typename Kernel, typename... Args, size_t... Indices, size_t... OutputI
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
void run_serialized(index_sequence<Indices...>, index_sequence<OutputIndices...>, void run_serialized(index_sequence<Indices...>, index_sequence<OutputIndices...>,
Kernel kernel, uint8_t* buffer, size_t capacity) { Kernel kernel, uint8_t* buffer, size_t capacity) {
using Eigen::internal::tuple_impl::get; using test_detail::get;
using Eigen::internal::tuple_impl::make_tuple; using test_detail::make_tuple;
using Eigen::internal::tuple_impl::tuple; using test_detail::tuple;
// Deserialize input size and inputs. // Deserialize input size and inputs.
size_t input_size; size_t input_size;
uint8_t* buff_ptr = Eigen::deserialize(buffer, input_size); uint8_t* buff_ptr = Eigen::deserialize(buffer, input_size);
@ -268,9 +273,9 @@ auto run_serialized_on_gpu(size_t buffer_capacity_hint,
} }
// Deserialize outputs. // Deserialize outputs.
auto args_tuple = Eigen::internal::tuple_impl::tie(args...); auto args_tuple = test_detail::tie(args...);
EIGEN_UNUSED_VARIABLE(args_tuple) // Avoid NVCC compile warning. EIGEN_UNUSED_VARIABLE(args_tuple) // Avoid NVCC compile warning.
host_ptr = Eigen::deserialize(host_ptr, Eigen::internal::tuple_impl::get<OutputIndices, Args&...>(args_tuple)...); host_ptr = Eigen::deserialize(host_ptr, test_detail::get<OutputIndices, Args&...>(args_tuple)...);
// Maybe deserialize return value, properly handling void. // Maybe deserialize return value, properly handling void.
typename void_helper::ReturnType<decltype(kernel(args...))> result; typename void_helper::ReturnType<decltype(kernel(args...))> result;