Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Template BruteForce on BoundingVolume #712

Merged

Conversation

aprokop
Copy link
Contributor

@aprokop aprokop commented Aug 16, 2022

This is in preparation to using brute force for multi-dimensional data.

Realistically, it's not really BoundingVolume, but rather some Value. But that can be changed with APIv2.

@aprokop aprokop added the API User visible interface modifications label Aug 16, 2022
test/CMakeLists.txt Outdated Show resolved Hide resolved
@aprokop aprokop force-pushed the template_brute_force_on_bounding_volume branch from 1b3f7f4 to 07b7ce3 Compare August 17, 2022 18:28
"#define ARBORX_TEST_TREE_TYPES Tuple<ArborX::BruteForce>\n"
"#include <ArborX_Box.hpp>\n"
"template <class MemorySpace> using ArborX__BruteForce = ArborX::BruteForce<MemorySpace, ArborX::Box>;\n"
"#define ARBORX_TEST_TREE_TYPES Tuple<ArborX__BruteForce>\n"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not needed either

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It won't work without:

In file included from arborx/build/test/tstQueryTreeCallbacks_BF.cpp:6:
In file included from arborx/test/tstQueryTreeCallbacks.cpp:19:
arborx/test/ArborXTest_TreeTypeTraits.hpp:81:31: error: template template argument has different template parameters than its corresponding template template parameter
    typename CartesianProduct<ARBORX_TEST_TREE_TYPES,
                              ^
arborx/build/test/tstQueryTreeCallbacks_BF.cpp:2:46: note: expanded from macro 'ARBORX_TEST_TREE_TYPES'
#define ARBORX_TEST_TREE_TYPES Tuple<ArborX::BruteForce>
                                             ^
arborx/src/ArborX_BruteForce.hpp:26:1: note: too many template parameters in template template argument
template <typename MemorySpace, typename BoundingVolume = Box>
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arborx/test/ArborXTest_TreeTypeTraits.hpp:20:11: note: previous template template parameter is here
template <template <class> class...>
          ^~~~~~~~~~~~~~~~

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh right

@aprokop aprokop merged commit 9d86ae4 into arborx:master Aug 17, 2022
@aprokop aprokop deleted the template_brute_force_on_bounding_volume branch August 17, 2022 20:55
@aprokop aprokop mentioned this pull request Aug 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
API User visible interface modifications
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants