From d26ac02b4a74baa2eb676fb70a28339905fe9f9d Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Fri, 6 Jun 2014 07:25:39 +0000 Subject: [PATCH] #if OPAL_HAVE_HWLOC protect access to orte_proc_info_t.cpuset Fix a bug when trunk is configured with --without-hwloc v1.8 is safe so no cmr This commit was SVN r31957. --- orte/util/nidmap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/orte/util/nidmap.c b/orte/util/nidmap.c index ff0db73fb2..af935f3f5b 100644 --- a/orte/util/nidmap.c +++ b/orte/util/nidmap.c @@ -773,10 +773,12 @@ static int decode_app_pidmap(opal_byte_object_t *bo) OBJ_DESTRUCT(&kv); } cpu_bitmap = NULL; +#if OPAL_HAVE_HWLOC if (orte_get_attribute(&pptr->attributes, ORTE_PROC_CPU_BITMAP, (void**)&cpu_bitmap, OPAL_STRING) && NULL != cpu_bitmap) { orte_process_info.cpuset = cpu_bitmap; } +#endif } else if (pptr->name.jobid == ORTE_PROC_MY_NAME->jobid && pptr->parent == ORTE_PROC_MY_DAEMON->vpid) { /* if we share a daemon, then add to my local peers */