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

UCT/ROCM: fix memory type detection #2

Merged
merged 19 commits into from
May 3, 2022
Merged
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
291fb17
UCT/IB/MLX5: Fix 2G aligned MR registration
Artemy-Mellanox Apr 11, 2022
d4ceb11
UCP/CORE/GTEST: Fix not deallocating memory from ucp_mem_unmap if no …
dmitrygx Apr 27, 2022
b019028
BUILD/UBUNTU: fixed io-demobuild
Apr 28, 2022
ec9ff2f
Merge pull request #8174 from dmitrygx/topic/ucp/mem_unmap
yosefe Apr 29, 2022
a1e671d
Merge pull request #8117 from Artemy-Mellanox/topic/reg_aligned
yosefe Apr 29, 2022
4cfa0ce
Merge pull request #8179 from hoopoepg/topic/fixed-io-demo-ubuntu
yosefe Apr 29, 2022
626e76c
UCS/PROFILE: Add UCS_PROFILE_xx_ALWAYS macros, enabled in release mode
yosefe Apr 29, 2022
2fffdee
Merge pull request #8184 from yosefe/topic/ucs-profile-add-ucs-profil…
yosefe May 1, 2022
f312584
UCT/SELF: Don't add device index if have only one device
yosefe May 1, 2022
7710598
UCT/IB: Fix log_ack_req_freq field initialization
gleon99 May 1, 2022
ea99a90
Merge pull request #8188 from gleon99/devx-req-ack-freq-fix
yosefe May 2, 2022
bf3921a
Merge pull request #8190 from yosefe/topic/uct-self-dont-add-device-i…
yosefe May 2, 2022
16cac3f
UCP/PROTO: Add op_attr_mask to rendezvous protocol selection
yosefe May 2, 2022
9a866ee
UCP/API: Move deprecated functions to ucp_compat.h
yosefe May 2, 2022
452ce18
GTEST: Updating is_ptr_in_range to silence warning
shamisp May 1, 2022
5b8522f
Merge pull request #8187 from shamisp/topic/fedora36
yosefe May 2, 2022
59551dd
Merge pull request #8194 from yosefe/topic/ucp-api-move-deprecated-fu…
yosefe May 2, 2022
2b7943a
Merge pull request #8192 from yosefe/topic/ucp-proto-add-op-attr-mask-to
yosefe May 3, 2022
6efdbb4
UCT/ROCM: fix memory type detection
edgargabriel Apr 29, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
UCT/IB: Fix log_ack_req_freq field initialization
gleon99 committed May 1, 2022
commit 771059821ac620fbb006db35fa0aa26d0fe03997
2 changes: 1 addition & 1 deletion src/uct/ib/rc/accel/rc_mlx5_common.h
Original file line number Diff line number Diff line change
@@ -430,7 +430,7 @@ typedef struct uct_rc_mlx5_iface_common_config {
size_t mp_num_strides;
} tm;
unsigned exp_backoff;
uint8_t log_ack_req_freq;
unsigned log_ack_req_freq;
UCS_CONFIG_STRING_ARRAY_FIELD(types) srq_topo;
} uct_rc_mlx5_iface_common_config_t;

5 changes: 2 additions & 3 deletions src/uct/ib/rc/accel/rc_mlx5_iface.c
Original file line number Diff line number Diff line change
@@ -760,7 +760,8 @@ UCS_CLASS_INIT_FUNC(uct_rc_mlx5_iface_common_t, uct_iface_ops_t *tl_ops,
self->super.config.fence_mode = (uct_rc_fence_mode_t)rc_config->fence_mode;
self->super.rx.srq.quota = self->rx.srq.mask + 1;
self->super.config.exp_backoff = mlx5_config->exp_backoff;
self->config.log_ack_req_freq = mlx5_config->log_ack_req_freq;
self->config.log_ack_req_freq = ucs_min(mlx5_config->log_ack_req_freq,
UCT_RC_MLX5_MAX_LOG_ACK_REQ_FREQ);

if ((rc_config->fence_mode == UCT_RC_FENCE_MODE_WEAK) ||
((rc_config->fence_mode == UCT_RC_FENCE_MODE_AUTO) &&
@@ -876,8 +877,6 @@ UCS_CLASS_INIT_FUNC(uct_rc_mlx5_iface_t,

self->super.super.config.tx_moderation = ucs_min(config->super.tx_cq_moderation,
self->super.tx.bb_max / 4);
self->super.config.log_ack_req_freq = ucs_min(config->super.log_ack_req_freq,
UCT_RC_MLX5_MAX_LOG_ACK_REQ_FREQ);

status = uct_rc_init_fc_thresh(&config->super, &self->super.super);
if (status != UCS_OK) {
2 changes: 0 additions & 2 deletions src/uct/ib/rc/base/rc_iface.h
Original file line number Diff line number Diff line change
@@ -174,8 +174,6 @@ struct uct_rc_iface_config {
unsigned tx_cq_moderation; /* How many TX messages are
batched to one CQE */
unsigned tx_cq_len;
unsigned log_ack_req_freq; /* Log of requests ack
frequency on DevX */
};