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.

Sign up for GitHub

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

Jump to bottom

Fix CUDA compilation #197

Merged
merged 6 commits into from
Nov 1, 2024
Merged

Fix CUDA compilation #197

merged 6 commits into from
Nov 1, 2024

Conversation

henry-wallace-phys
Copy link
Contributor

Pull request description

Patch to ensure MaCh3 compiles on GPU again

Changes or fixes

  • Changes remaining MaCh3CompilerOptions to MaCh3CompileDefinitions in CUDASamples.cmake and CUDASetup.cmake

  • Changes to using NuFastLinear by default as CUDAProb3 will no longer compile

  • Ignores errors on #include <cuda_runtime.h> as it still has C-style casts

    MaCh3/manager/gpuUtils.cuh

    Lines 10 to 13 in f511bc1

    #pragma GCC diagnostic push
    #pragma GCC diagnostics ignored "-Wold-style-cast"
    #include <cuda_runtime.h>
    #pragma GCC diagnostic pop

@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 1, 2024

Hi @henry-wallace-phys, thank you for contributing to MaCh3! Please wait for MaCh3 developers to review your PR. If no one answers within a week, please message people from this list: https://github.com/orgs/mach3-software/teams/mach3admin . While waiting, please enjoy this

meme

Use this action on your projects. Use jokes on issues instead.

Absolute hack, need to fix CI to run with default MaCh3 behaviour, ho…
9094bbd 
…wever, since it's just CPU swaps to CUDAProb3 install for CI
@github-actions github-actions bot added the CI/CD CI/CD label Nov 1, 2024
@KSkwarczynski KSkwarczynski merged commit 5f39fd7 into develop Nov 1, 2024
11 of 13 checks passed
@KSkwarczynski KSkwarczynski deleted the patches/hwallace/fix_cuda_compiler_opts branch November 1, 2024 17:02
@KSkwarczynski KSkwarczynski mentioned this pull request Nov 6, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KSkwarczynski KSkwarczynski Awaiting requested review from KSkwarczynski KSkwarczynski is a code owner

@EdAtkin EdAtkin Awaiting requested review from EdAtkin EdAtkin is a code owner

Assignees
No one assigned
Labels
CI/CD CI/CD Cmake GPU Manager
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@henry-wallace-phys @KSkwarczynski