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

[gpuCI] Forward-merge branch-21.06 to branch-21.08 [skip ci] #782

Merged
merged 7 commits into from
May 24, 2021

Conversation

GPUtester
Copy link
Contributor

Forward-merge triggered by push to branch-21.06 that creates a PR to keep branch-21.08 up-to-date. If this PR is unable to be immediately merged due to conflicts, it will remain open for the team to manually merge.

ajschmidt8 and others added 4 commits May 20, 2021 15:52
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
@GPUtester
Copy link
Contributor Author

FAILURE - Unable to forward-merge due to conflicts, manual merge is necessary. Do not use the Resolve conflicts option in this PR, follow these instructions https://docs.rapids.ai/maintainers/gpuci/#forward-mergers
IMPORTANT: Before merging and approving this PR, be sure to change the merging strategy to Create a Merge Commit. Otherwise, history will be lost and the branches become incompatible.

…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
@rapids-bot rapids-bot bot requested a review from a team as a code owner May 24, 2021 03:35
@github-actions github-actions bot added the CMake label May 24, 2021
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
@rapids-bot rapids-bot bot requested a review from a team as a code owner May 24, 2021 15:45
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
@kkraus14 kkraus14 merged commit f1da9be into branch-21.08 May 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants