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

UCP/WIREUP: Handle address count > 64 - v1.11.x #7398

Merged

Conversation

dmitrygx
Copy link
Member

Porting #7350 to v1.11.x

Copy link
Contributor

@yosefe yosefe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. any conflicts?
  2. pls add NEWS

@dmitrygx
Copy link
Member Author

1. any conflicts?

yes, here is the conflict:

diff --cc src/ucp/wireup/select.c
index ae0d758,d91b598..0000000
--- a/src/ucp/wireup/select.c
+++ b/src/ucp/wireup/select.c
@@@ -292,7 -294,10 +292,14 @@@ static UCS_F_NOINLINE ucs_status_t ucp_
      ucp_wireup_select_info_t sinfo        = {0};
      int found                             = 0;
      uint64_t local_iface_flags            = criteria->local_iface_flags;
++<<<<<<< HEAD
 +    uint64_t addr_index_map, rsc_addr_index_map;
++=======
+     int has_cm                            =
+             ucp_ep_init_flags_has_cm(select_params->ep_init_flags);
+     uint64_t local_md_flags;
+     ucp_tl_addr_bitmap_t addr_index_map, rsc_addr_index_map;
++>>>>>>> 2aff5da... UCP/WIREUP: Handle address count > 64
      const ucp_wireup_lane_desc_t *lane_desc;
      unsigned addr_index;
      uct_tl_resource_desc_t *resource;

2. pls add NEWS

can we update NEWS for #7398 and #7399 together in separate PR to avoid merge conflicts?

@yosefe
Copy link
Contributor

yosefe commented Sep 14, 2021

can we update NEWS for #7398 and #7399 together in separate PR to avoid merge conflicts?

OK

@yosefe yosefe changed the title UCP/WIREUP: Handle address count > 64 UCP/WIREUP: Handle address count > 64 - v1.11.x Sep 14, 2021
@yosefe yosefe added this to the v1.11.2 milestone Sep 14, 2021
@dmitrygx dmitrygx merged commit aca5cf7 into openucx:v1.11.x Sep 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants