From 1314cf2640c47c52e8b8be1910d1e8bc17389167 Mon Sep 17 00:00:00 2001 From: Joshua Hursey Date: Tue, 19 Mar 2019 11:52:22 -0500 Subject: [PATCH] Do not force 'hash' gds on direct modex in pmix4x * Forcing the 'hash' gds component should not be necessary any more. Signed-off-by: Joshua Hursey --- opal/mca/pmix/pmix4x/pmix4x_client.c | 6 +----- opal/mca/pmix/pmix4x/pmix4x_server_south.c | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/opal/mca/pmix/pmix4x/pmix4x_client.c b/opal/mca/pmix/pmix4x/pmix4x_client.c index 73855876f2..d7ea3f6bb1 100644 --- a/opal/mca/pmix/pmix4x/pmix4x_client.c +++ b/opal/mca/pmix/pmix4x/pmix4x_client.c @@ -11,6 +11,7 @@ * Copyright (c) 2017-2018 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. + * Copyright (c) 2019 IBM Corporation. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -101,11 +102,6 @@ int pmix4x_client_init(opal_list_t *ilist) ninfo = 0; } - /* check for direct modex use-case */ - if (opal_pmix_base_async_modex && !opal_pmix_collect_all_data) { - opal_setenv("PMIX_MCA_gds", "hash", true, &environ); - } - OPAL_PMIX_RELEASE_THREAD(&opal_pmix_base.lock); rc = PMIx_Init(&mca_pmix_pmix4x_component.myproc, pinfo, ninfo); if (NULL != pinfo) { diff --git a/opal/mca/pmix/pmix4x/pmix4x_server_south.c b/opal/mca/pmix/pmix4x/pmix4x_server_south.c index dbc7eed689..9102af45b0 100644 --- a/opal/mca/pmix/pmix4x/pmix4x_server_south.c +++ b/opal/mca/pmix/pmix4x/pmix4x_server_south.c @@ -12,6 +12,7 @@ * Copyright (c) 2017-2018 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. + * Copyright (c) 2019 IBM Corporation. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -132,11 +133,6 @@ int pmix4x_server_init(opal_pmix_server_module_t *module, } } - /* check for direct modex use-case */ - if (opal_pmix_base_async_modex && !opal_pmix_collect_all_data) { - opal_setenv("PMIX_MCA_gds", "hash", true, &environ); - } - /* insert ourselves into our list of jobids - it will be the * first, and so we'll check it first */ job = OBJ_NEW(opal_pmix4x_jobid_trkr_t);