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

Fix no-cuda build #484

Merged
merged 3 commits into from
Oct 3, 2024
Merged

Fix no-cuda build #484

merged 3 commits into from
Oct 3, 2024

Conversation

madsbk
Copy link
Member

@madsbk madsbk commented Oct 3, 2024

Closes #482

@madsbk madsbk added bug Something isn't working non-breaking Introduces a non-breaking change labels Oct 3, 2024
@madsbk madsbk marked this pull request as ready for review October 3, 2024 08:06
@madsbk madsbk requested review from a team as code owners October 3, 2024 08:06
#define KVIKIO_NVTX_FUNC_RANGE_2(msg, val) \
do { \
} while (0)
#endif
Copy link
Contributor

Choose a reason for hiding this comment

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

Could shovel this into the shim, but because it only appears here that seems like overkill.

@@ -300,6 +302,7 @@ struct libkvikio_domain {

// Macro overloads of KVIKIO_NVTX_FUNC_RANGE
#define KVIKIO_NVTX_FUNC_RANGE_1() NVTX3_FUNC_RANGE_IN(libkvikio_domain)
#ifdef KVIKIO_CUDA_FOUND
Copy link
Contributor

@bdice bdice Oct 3, 2024

Choose a reason for hiding this comment

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

Why is this guard only needed for KVIKIO_NVTX_FUNC_RANGE_2 but not KVIKIO_NVTX_FUNC_RANGE_1? The KVIKIO_NVTX_FUNC_RANGE_1 appears to call an NVTX macro but that wouldn't be defined if nvtx wasn't included above... right?

Copy link
Member Author

Choose a reason for hiding this comment

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

Good catch, it worked because BASIC_NO_CUDA_EXAMPLE never materialize KVIKIO_NVTX_FUNC_RANGE_1.
I have included all of them in the ifdef guard now: 168dd0c

@madsbk madsbk requested a review from bdice October 3, 2024 15:24
@madsbk
Copy link
Member Author

madsbk commented Oct 3, 2024

/merge

@rapids-bot rapids-bot bot merged commit 5a733bd into rapidsai:branch-24.10 Oct 3, 2024
56 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working non-breaking Introduces a non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

nvtx3/nvtx3.hpp file not found for CPU-only build.
3 participants