Merge pull request #10511 from janjust/osc-ucx-priority-fix

osc/ucx: priority setting, don't override user priority setting

Author: janjust

ompi/mca/osc/ucx/osc_ucx_component.c

@@ -246,8 +246,10 @@ static int ucp_context_init(bool enable_mt, int proc_world_size) {
 }
 
 static int component_init(bool enable_progress_threads, bool enable_mpi_threads) {
-    opal_common_ucx_support_level_t support_level;
-    int ret = OMPI_SUCCESS;
+    opal_common_ucx_support_level_t support_level = OPAL_COMMON_UCX_SUPPORT_NONE;
+    mca_base_var_source_t param_source = MCA_BASE_VAR_SOURCE_DEFAULT;
+    int ret = OMPI_SUCCESS,
+        param = -1;
 
     mca_osc_ucx_component.enable_mpi_threads = enable_mpi_threads;
     mca_osc_ucx_component.wpool = opal_common_ucx_wpool_allocate();
@@ -265,13 +267,21 @@ static int component_init(bool enable_progress_threads, bool enable_mpi_threads)
         return OMPI_ERR_NOT_AVAILABLE;
     }
 
+    param = mca_base_var_find("ompi","osc","ucx","priority");
+    if (0 <= param) {
+        (void) mca_base_var_get_value(param, NULL, &param_source, NULL);
+    }
+
     /*
      * Retain priority if we have supported devices and transports.
      * Lower priority if we have supported transports, but not supported devices.
      */
-    mca_osc_ucx_component.priority = (support_level == OPAL_COMMON_UCX_SUPPORT_DEVICE) ?
-                mca_osc_ucx_component.priority : 19;
+    if(MCA_BASE_VAR_SOURCE_DEFAULT == param_source) {
+        mca_osc_ucx_component.priority = (support_level == OPAL_COMMON_UCX_SUPPORT_DEVICE) ?
+                    mca_osc_ucx_component.priority : 9;
+    }
     OSC_UCX_VERBOSE(2, "returning priority %d", mca_osc_ucx_component.priority);
+
     return OMPI_SUCCESS;
 }