Forward merge 0.19 into 0.20 #374
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
…ai#369) Fixes [this build error](https://gpuci.gpuopenanalytics.com/job/rapidsai/job/docker/job/rapidsai-core-devel/324/BUILD_IMAGE=rapidsai%2Frapidsai-core-dev-nightly,CUDA_VER=10.2,FROM_IMAGE=gpuci%2Frapidsai,IMAGE_TYPE=devel,LINUX_VER=ubuntu16.04,PYTHON_VER=3.8,RAPIDS_VER=0.19/console). Authors: - Paul Taylor (@trxcllnt) Approvers: - Keith Kraus (@kkraus14) - H. Thomson Comer (@thomcom) URL: rapidsai#369
…i#365) This PR includes many of the same changes as were made in [cudf/pull/7107](rapidsai/cudf#7107). * Export `cuspatial::cuspatial` CMake alias targets. * Fixes -Wall errors discovered when changing compile flags. * Use `CPMFindPackage` to find `libcudf` installed on the system or build `libcudf` from source. edit: Depends on rapidsai/cudf#7574 and rapidsai/cudf#7734 Authors: - Paul Taylor (@trxcllnt) Approvers: - AJ Schmidt (@ajschmidt8) - Mark Harris (@harrism) - Keith Kraus (@kkraus14) URL: rapidsai#365
Ensure all conda packages created in this repo that depend on other packages are all version pinned to the same build number. This way it prevents a conda solve from picking mismatched versions of `cuspatial` and `libcuspatial` that can break this repo during builds and testing. Authors: - Mike Wendt (@mike-wendt) Approvers: - Ray Douglass (@raydouglass) URL: rapidsai#370
) Reverts rapidsai#370 Authors: - Ray Douglass (https://github.com/raydouglass) Approvers: - AJ Schmidt (https://github.com/ajschmidt8) URL: rapidsai#372
github-actions
bot
added
cmake
raydouglass
added
non-breaking
raydouglass
changed the title
|
rerun tests |
kkraus14
approved these changes
Apr 7, 2021
|
kkraus14
reviewed
Apr 7, 2021
kkraus14
reviewed
Apr 7, 2021
raydouglass
force-pushed
the
branch-0.20-merge-0.19
branch
from
d1fadd6 to
78e3db6
Compare
trxcllnt
approved these changes
Apr 8, 2021
ajschmidt8
approved these changes
Apr 8, 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.
DO NOT USE auto-merger, this must be merged with a merge commit!
This follows up on #371