Fix Merge Conflicts [skip ci] #786
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge `branch-0.19` into `branch-21.06` [skip ci]
This PR updates the `0.20` references in `CHANGELOG.md` to be `21.06`. Authors: - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - https://github.com/jakirkham - Dillon Cullinan (https://github.com/dillon-cullinan) URL: #781
…rs (#784) When multiple projects included via CPM depend on RMM we need to make sure that we only try to add target `thrust_internal`. Authors: - Robert Maynard (https://github.com/robertmaynard) Approvers: - Keith Kraus (https://github.com/kkraus14) URL: #784
The new version includes `fmt` version 7.1.3 which fixed the problem with cuda 10.x. @harrism @kkraus14 Authors: - Rong Ou (https://github.com/rongou) Approvers: - Keith Kraus (https://github.com/kkraus14) - Mark Harris (https://github.com/harrism) - Mike Wendt (https://github.com/mike-wendt) - AJ Schmidt (https://github.com/ajschmidt8) URL: #658
This PR updates the environment variable thats used to determine the `cuda_version` varaible in our conda recipes. The `CUDA` environment variable is explicitly set by the Ops team in our Jenkins jobs, whereas `CUDA_VERSION` comes from the `nvidia/cuda` Docker images that we base our images from. Authors: - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - Ray Douglass (https://github.com/raydouglass) URL: #785
ajschmidt8
added
non-breaking
kkraus14
approved these changes
May 24, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes the merge conflicts in #782.