Merge pull request #9377 from karasevb/topic/v5.0.x/ucx_tls_list_fix

gpaulsen · web-flow · commit e5c3dac061cb · 2021-09-16T09:13:52.000-05:00
v5.0.x: pml/ucx: added `ud_mlx5` to default tls list
diff --git a/opal/mca/common/ucx/common_ucx.c b/opal/mca/common/ucx/common_ucx.c
@@ -45,7 +45,7 @@ static void opal_common_ucx_mem_release_cb(void *buf, size_t length, void *cbdat
 
 OPAL_DECLSPEC void opal_common_ucx_mca_var_register(const mca_base_component_t *component)
 {
-    static const char *default_tls = "rc_verbs,ud_verbs,rc_mlx5,dc_mlx5,cuda_ipc,rocm_ipc";
+    static const char *default_tls = "rc_verbs,ud_verbs,rc_mlx5,dc_mlx5,ud_mlx5,cuda_ipc,rocm_ipc";
     static const char *default_devices = "mlx*";
     static int hook_index;
     static int verbose_index;

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ static void opal_common_ucx_mem_release_cb(void buf, size_t length, void cbdat`
`45`	`45`
`46`	`46`	`OPAL_DECLSPEC void opal_common_ucx_mca_var_register(const mca_base_component_t *component)`
`47`	`47`	`{`
`48`		`- static const char *default_tls = "rc_verbs,ud_verbs,rc_mlx5,dc_mlx5,cuda_ipc,rocm_ipc";`
	`48`	`+ static const char *default_tls = "rc_verbs,ud_verbs,rc_mlx5,dc_mlx5,ud_mlx5,cuda_ipc,rocm_ipc";`
`49`	`49`	`static const char default_devices = "mlx";`
`50`	`50`	`static int hook_index;`
`51`	`51`	`static int verbose_index;`