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

CMake CUDA clean-up. #1804

Merged
merged 8 commits into from
Jan 21, 2022
Merged

Conversation

thorstenhater
Copy link
Contributor

@thorstenhater thorstenhater commented Jan 20, 2022

  • Bump CMake to 3.18 for better CUDA support

  • Clean-up our use of said support

  • Remove old cruft and workarounds

  • Maintenance in CI

    • enable MacOS 11
    • bump CMake versions to 3.18 / 3.22
    • bump bors CMake to 3.18

Fixes #1790

@thorstenhater
Copy link
Contributor Author

bors try

bors bot added a commit that referenced this pull request Jan 20, 2022
@thorstenhater thorstenhater mentioned this pull request Jan 20, 2022
2 tasks
@bors
Copy link

bors bot commented Jan 20, 2022

try

Build failed:

@thorstenhater
Copy link
Contributor Author

bors try

bors bot added a commit that referenced this pull request Jan 20, 2022
# The CUDA package is needed for clang compilation for the same reasons as above.
# enable_langaue(CUDA) has a bug with clang
find_package(CUDA 10 REQUIRED)
enable_language(CUDA)
Copy link
Contributor

Choose a reason for hiding this comment

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

Duplicate of line 114.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, since we are here checking for CUDA-clang and CUDA in l114

@bors
Copy link

bors bot commented Jan 20, 2022

try

Build failed:

@thorstenhater
Copy link
Contributor Author

bors try

bors bot added a commit that referenced this pull request Jan 20, 2022
@bors
Copy link

bors bot commented Jan 20, 2022

try

Build succeeded:

Copy link
Contributor

@noraabiakar noraabiakar left a comment

Choose a reason for hiding this comment

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

lgtm!
But we need to update the minimum CMake version in the docs: https://docs.arbor-sim.org/en/latest/install/build_install.html

@noraabiakar
Copy link
Contributor

bors try

bors bot added a commit that referenced this pull request Jan 21, 2022
@noraabiakar noraabiakar merged commit b2cb6ce into arbor-sim:master Jan 21, 2022
@bors
Copy link

bors bot commented Jan 21, 2022

try

Build succeeded:

@thorstenhater thorstenhater deleted the cmake-cuda-clean branch January 21, 2022 18:43
max9901 pushed a commit to max9901/arbor that referenced this pull request Feb 3, 2022
- Bump CMake to 3.18 for better CUDA support.
- Clean-up our use of said support.
- Remove old cruft and workarounds.
- Maintenance in CI: enable MacOS 11; bump CMake versions to 3.18 / 3.22; bump bors CMake to 3.18

Fixes arbor-sim#1790
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[URGENT] Migrate CI to MacOS 11
2 participants