-
Notifications
You must be signed in to change notification settings - Fork 3
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
#12: remove BVH_ENABLE_KOKKOS
macro
#13
Conversation
481a468
to
457afc9
Compare
The failing PR is because of the bottleneck in NimbleSM right now (NimbleSM/NimbleSM#355) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me!
src/bvh/patch.hpp
Outdated
#include <Kokkos_Core.hpp> | ||
#endif | ||
|
||
namespace bvh | ||
{ | ||
#if 0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, we probably should have removed this dead code a long time ago
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed the #if 0
block completely.
4bcb99d
to
6e323e8
Compare
BVH_ENABLE_KOKKOS
macroBVH_ENABLE_KOKKOS
macro
6e323e8
to
70a9b4f
Compare
Can you rebase? I (finally)) merged the clustering branch |
70a9b4f
to
9c337dd
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great! Just the one #if defined
that should be changed
src/bvh/hash.hpp
Outdated
|
||
#if !defined(BVH_ENABLE_KOKKOS) || defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST) | ||
#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
was removed a while ago and I guess I forgot to remove it from here. I think the best bet is to change this to defined(__GNUC__)
since I believe that will work for both gcc and clang host compilers.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Replaced with __GNUC__
👌
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
fixes #12