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

Forward-merge branch-24.04 into branch-24.06 [skip ci] #4259

Merged
merged 1 commit into from
Mar 20, 2024

Conversation

rapids-bot[bot]
Copy link

@rapids-bot rapids-bot bot commented Mar 19, 2024

Forward-merge triggered by push to branch-24.04 that creates a PR to keep branch-24.06 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. See forward-merger docs for more info.

…to test with edge masking (#4253)

We previously had `test_utilities.hpp` having all different sorts of function declarations and `property_generator.cuh` (which is necessary to create an edge mask) was only for primitives testing.

This PR divides `test_utilities.hpp` to multiple files (`check_utilities.hpp`, `conversion_utilities.hpp`, `csv_file_utilities.hpp`, `matrix_market_file_utilities.hpp`, and `misc_utilties.hpp`) renamed/moved `tests/prims/property_generator.cuh` to `tests/utilities/property_generator_utilities.hpp` (now this file can be included from .cpp files).

Updated SG & MG core_number tests to use property generator to create an edge mask.

Authors:
  - Seunghwa Kang (https://github.com/seunghwak)

Approvers:
  - Naim (https://github.com/naimnv)
  - Joseph Nke (https://github.com/jnke2016)
  - Chuck Hastings (https://github.com/ChuckHastings)

URL: #4253
@rapids-bot rapids-bot bot requested review from a team as code owners March 19, 2024 20:38
Copy link
Author

rapids-bot bot commented Mar 19, 2024

FAILURE - Unable to forward-merge due to an error, manual merge is necessary. Do not use the Resolve conflicts option in this PR, follow these instructions https://docs.rapids.ai/maintainers/forward-merger/

IMPORTANT: When merging this PR, do not use the auto-merger (i.e. the /merge comment). Instead, an admin must manually merge by changing the merging strategy to Create a Merge Commit. Otherwise, history will be lost and the branches become incompatible.

@AyodeAwe AyodeAwe merged commit b2a3890 into branch-24.06 Mar 20, 2024
277 of 287 checks passed
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.

2 participants