Skip to content

Commit 9f926b8

Browse files
author
Ralph Castain
committed
Silence warning on Mac - we know Mac doesn't support hwloc, and so it doesn't matter if a VM hole isn't found. It also doesn't matter in general as all it really means is that we have to turn the hwloc shmem support "off".
Signed-off-by: Ralph Castain <[email protected]>
1 parent 2216b80 commit 9f926b8

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

orte/mca/rtc/hwloc/rtc_hwloc.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,7 @@ static size_t shmemsize = 0;
6666
static size_t shmemaddr;
6767
static char *shmemfile = NULL;
6868
static int shmemfd = -1;
69-
#endif
7069

71-
#if HWLOC_API_VERSION >= 0x20000
7270
static int parse_map_line(const char *line,
7371
unsigned long *beginp,
7472
unsigned long *endp,
@@ -112,8 +110,8 @@ static int init(void)
112110

113111
if (ORTE_SUCCESS != (rc = find_hole(mca_rtc_hwloc_component.kind,
114112
&shmemaddr, shmemsize))) {
115-
ORTE_ERROR_LOG(rc);
116-
return rc;
113+
/* we couldn't find a hole, so don't use the shmem support */
114+
return ORTE_SUCCESS;
117115
}
118116
/* create the shmem file in our session dir so it
119117
* will automatically get cleaned up */
@@ -182,7 +180,8 @@ static void assign(orte_job_t *jdata)
182180
opal_list_t *cache;
183181
opal_value_t *kv;
184182

185-
if (VM_HOLE_NONE == mca_rtc_hwloc_component.kind) {
183+
if (VM_HOLE_NONE == mca_rtc_hwloc_component.kind ||
184+
NULL == shmemfile) {
186185
return;
187186
}
188187
/* add the shmem address and size to the job-level info that

0 commit comments

Comments
 (0)