Fix merge conflicts in 1631#1639
Merged
ajschmidt8 merged 11 commits intorapidsai:branch-21.08from Jun 1, 2021
ajschmidt8:branch-21.08-merge-21.06
Merged
Fix merge conflicts in 1631#1639ajschmidt8 merged 11 commits intorapidsai:branch-21.08from ajschmidt8:branch-21.08-merge-21.06
ajschmidt8 merged 11 commits intorapidsai:branch-21.08from
ajschmidt8:branch-21.08-merge-21.06
Conversation
Updated dependencies for CalVer Note: I have not tested this yet. Authors: - Rick Ratzel (https://github.com/rlratzel) Approvers: - Brad Rees (https://github.com/BradReesWork) - AJ Schmidt (https://github.com/ajschmidt8) URL: #1629
…ec_policy` (#1625) Fixes an issue where the layout for all points converge to `(0,0)` when running multiple layout ticks after #1607. * Initializes the `d_old_forces` vector to fix layout issue. * Updates to `barnes_hut.hpp` to use non-deprecated `rmm::exec_policy`. Authors: - Paul Taylor (https://github.com/trxcllnt) Approvers: - Hugo Linsenmaier (https://github.com/hlinsen) - Alex Fender (https://github.com/afender) URL: #1625
This tracks work on graph object serialization and broadcasting functionality: 1. C++ support of un/serialization; 2. C++ / Python support for broadcasting graph; Python / Dask orchestration for assembling all the functionality above will follow up in a future task, when a few more dependencies will become clearer (`graph_t` object Python wrapper, or opaque handle; decision on whether/when to implement dispatch layer; or even forgo the graph object in python, altogether, and just call a function stub after broadcasting: `distribute_and_call(functor, params)`, etc.); The RW Batch functionality is currently under review. Consequently, the scope of this PR has been modified accordingly. Authors: - Andrei Schaffer (https://github.com/aschaffer) Approvers: - Chuck Hastings (https://github.com/ChuckHastings) - Brad Rees (https://github.com/BradReesWork) URL: #1580
cc @raydouglass @pentschev @quasiben Authors: - https://github.com/jakirkham Approvers: - Peter Andreas Entschev (https://github.com/pentschev) - Ray Douglass (https://github.com/raydouglass) URL: #1634
ajschmidt8
added
improvement
…icy thrust::seq) from copy_v_transform_reduce_key_aggregated_out_nbr (#1627) thrust::sort(thrust::seq, ....) does not work with arbitrary large input data size and this call can fail if the array size to locally sort is large. This code replaces many thread local sort with one thrust::sort call from host. Authors: - Seunghwa Kang (https://github.com/seunghwak) Approvers: - Chuck Hastings (https://github.com/ChuckHastings) - Andrei Schaffer (https://github.com/aschaffer) URL: #1627
Similar to rapidsai/cuml#3901. After #1491 and #rapids-cmake and #1585, now at install time, the cugraph headers are being nested into `path/to/env/include/cugraph/cugraph` instead of just `path/to/env/include/cugraph/`. This, as far as I'm aware, is unintentional and unlike the rest of RAPIDS projects (cuDF, RMM and cuML). cc @trxcllnt @robertmaynard Authors: - Dante Gama Dessavre (https://github.com/dantegd) Approvers: - Chuck Hastings (https://github.com/ChuckHastings) - Robert Maynard (https://github.com/robertmaynard) - Seunghwa Kang (https://github.com/seunghwak) - Paul Taylor (https://github.com/trxcllnt) - Rick Ratzel (https://github.com/rlratzel) URL: #1630
Discovered this bug during louvain testing. The variable `idx` is an index controlling iteration over a subset of the vertices, while `major_offset` identifies a particular vertex offset in the overall data structure. Several places where using `idx` where they needed to be using `major_offset`. Authors: - Chuck Hastings (https://github.com/ChuckHastings) Approvers: - Seunghwa Kang (https://github.com/seunghwak) - Andrei Schaffer (https://github.com/aschaffer) URL: #1633
Authors: - https://github.com/Iroy30 Approvers: - Chuck Hastings (https://github.com/ChuckHastings) - Rick Ratzel (https://github.com/rlratzel) URL: #1612
`set_target_properties(cugraphmgtestutil PROPERTIES CUDA_ARCHITECTURES OFF)` was set and this caused cudaFuncGetAttribute to intermittently return an invalid PTX version. This PR deletes this. Authors: - Seunghwa Kang (https://github.com/seunghwak) Approvers: - Chuck Hastings (https://github.com/ChuckHastings) - Rick Ratzel (https://github.com/rlratzel) URL: #1638
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
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 #1631.