From 61108b6228f8450c93a8b050fc1da6228fd09517 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Tue, 8 Jan 2019 10:09:10 +0900 Subject: [PATCH] pmix/ext3x: fix support for external PMIx v3.1 The PMIX_MODEX and PMIX_INFO_ARRAY macros were removed from the PMIx 3.1 standard. Open MPI does not really need them (they are only used to be reported as not supported), so smply #ifdef protect them to support an external PMIx v3.1 The change only need to be done in ext3x/ext3x.c. But since this file is automatically generated from pmix3x/pmix3x.c, we have to update the latter file. Refs. open-mpi/ompi#6247 Signed-off-by: Gilles Gouaillardet (back-ported from commit open-mpi/ompi@950ba16aa16576582eb71941ec45996239c10a46) --- opal/mca/pmix/pmix3x/pmix3x.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/opal/mca/pmix/pmix3x/pmix3x.c b/opal/mca/pmix/pmix3x/pmix3x.c index 73288ff842..5e0e91342b 100644 --- a/opal/mca/pmix/pmix3x/pmix3x.c +++ b/opal/mca/pmix/pmix3x/pmix3x.c @@ -1,8 +1,8 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014-2018 Intel, Inc. All rights reserved. - * Copyright (c) 2014-2017 Research Organization for Information Science - * and Technology (RIST). All rights reserved. + * Copyright (c) 2014-2019 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * Copyright (c) 2014-2015 Mellanox Technologies, Inc. * All rights reserved. * Copyright (c) 2016 Cisco Systems, Inc. All rights reserved. @@ -1106,10 +1106,12 @@ int pmix3x_value_unload(opal_value_t *kv, OPAL_ERROR_LOG(OPAL_ERR_NOT_SUPPORTED); rc = OPAL_ERR_NOT_SUPPORTED; break; +#ifdef PMIX_MODEX case PMIX_MODEX: OPAL_ERROR_LOG(OPAL_ERR_NOT_SUPPORTED); rc = OPAL_ERR_NOT_SUPPORTED; break; +#endif /* PMIX_MODEX */ case PMIX_PERSIST: kv->type = OPAL_PERSIST; kv->data.uint8 = pmix3x_convert_persist(v->data.persist); @@ -1218,10 +1220,12 @@ int pmix3x_value_unload(opal_value_t *kv, OPAL_ERROR_LOG(OPAL_ERR_NOT_SUPPORTED); rc = OPAL_ERR_NOT_SUPPORTED; break; +#ifdef PMIX_INFO_ARRAY case PMIX_INFO_ARRAY: OPAL_ERROR_LOG(OPAL_ERR_NOT_SUPPORTED); rc = OPAL_ERR_NOT_SUPPORTED; break; +#endif /* PMIX_INFO_ARRAY */ case PMIX_IOF_CHANNEL: OPAL_ERROR_LOG(OPAL_ERR_NOT_SUPPORTED); rc = OPAL_ERR_NOT_SUPPORTED;