From 30f98cd9d02ca82b3a36a495219e90dfb1cf3511 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Thu, 4 Aug 2016 13:31:28 +0900 Subject: [PATCH] pmix: redefine OPAL_PMIX_ARCH macro Architecture is set by the ompi layer *after* job startup, so the key cannot have the "pmix" prefix since optimizations in open-mpi/ompi@01a653d50a996f044d8daff54261ac8de3a51de7 otherwise architecture cannot be retrieved --- opal/mca/pmix/pmix_types.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opal/mca/pmix/pmix_types.h b/opal/mca/pmix/pmix_types.h index f0867851e0..195f0fa507 100644 --- a/opal/mca/pmix/pmix_types.h +++ b/opal/mca/pmix/pmix_types.h @@ -1,5 +1,7 @@ /* * Copyright (c) 2014-2016 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,8 @@ BEGIN_C_DECLS #define OPAL_PMIX_CPUSET "pmix.cpuset" // (char*) hwloc bitmap applied to proc upon launch #define OPAL_PMIX_CREDENTIAL "pmix.cred" // (char*) security credential assigned to proc #define OPAL_PMIX_SPAWNED "pmix.spawned" // (bool) true if this proc resulted from a call to PMIx_Spawn -#define OPAL_PMIX_ARCH "pmix.arch" // (uint32_t) datatype architecture flag +#define OPAL_PMIX_ARCH "opal.pmix.arch" // (uint32_t) datatype architecture flag + // not set at job startup, so cannot have the pmix prefix /* scratch directory locations for use by applications */ #define OPAL_PMIX_TMPDIR "pmix.tmpdir" // (char*) top-level tmp dir assigned to session