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

Update set_union.hpp #6638

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

harith-hacky03
Copy link

Fixes #6631

Proposed Changes

  • Updated result type to
    -using result_type = hpx::parallel::util::in_in_out_result<FwdIter1, FwdIter2, FwdIter3>;

Any background context you want to provide?

Checklist

Not all points below apply to all pull requests.

  • [*] I have added a new feature and have added tests to go along with it.
  • [*] I have fixed a bug and have added a regression test.
  • [*] I have added a test using random numbers; I have made sure it uses a seed, and that random numbers generated are valid inputs for the tests.

@harith-hacky03 harith-hacky03 requested a review from hkaiser as a code owner March 12, 2025 04:48
@StellarBot
Copy link

Can one of the admins verify this patch?

Copy link

codacy-production bot commented Mar 12, 2025

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation Diff coverage
Report missing for d736bb51
Coverage variation details
Coverable lines Covered lines Coverage
Common ancestor commit (d736bb5) Report Missing Report Missing Report Missing
Head commit (315bd87) 193232 164421 85.09%

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details
Coverable lines Covered lines Diff coverage
Pull request (#6638) 0 0 ∅ (not applicable)

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings    Change summary preferences

Codacy stopped sending the deprecated coverage status on June 5th, 2024. Learn more

Footnotes

  1. Codacy didn't receive coverage data for the commit, or there was an error processing the received data. Check your integration for errors and validate that your coverage setup is correct.

@hkaiser
Copy link
Member

hkaiser commented Mar 12, 2025

Thanks for this patch. Could you please fix the clan-format errors reported?

diff --git a/libs/core/algorithms/include/hpx/parallel/algorithms/set_union.hpp b/libs/core/algorithms/include/hpx/parallel/algorithms/set_union.hpp
index 006ce98..9c08152 100644
--- a/libs/core/algorithms/include/hpx/parallel/algorithms/set_union.hpp
+++ b/libs/core/algorithms/include/hpx/parallel/algorithms/set_union.hpp
@@ -401,7 +401,8 @@ namespace hpx {
             static_assert(hpx::traits::is_output_iterator_v<FwdIter3>,
                 "Requires at least output iterator.");
 
-            using result_type = hpx::parallel::util::in_in_out_result<FwdIter1, FwdIter2, FwdIter3>;
+            using result_type = hpx::parallel::util::in_in_out_result<FwdIter1,
+                FwdIter2, FwdIter3>;
 
             return hpx::parallel::util::get_third_element(
                 hpx::parallel::detail::set_union<result_type>().call(

@hkaiser hkaiser added this to the 1.11.0 milestone Mar 12, 2025
@harith-hacky03
Copy link
Author

@hkaiser Can you check it now?

@hkaiser
Copy link
Member

hkaiser commented Mar 12, 2025

@hkaiser Can you check it now?

clang-format is still complaining. Please note, our CI uses clang-format v11. This could be the reason for the problems as the tool is not always consistent with itself across versions. Please apply the patch I showed above to work around this.

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.

set_union incorrect result type
3 participants