1
1
This commit was SVN r22946.

The following Trac tickets were found above:
  Ticket 2073 --> https://svn.open-mpi.org/trac/ompi/ticket/2073
Этот коммит содержится в:
Terry Dontje 2010-04-08 18:17:44 +00:00
родитель 75e99e6118
Коммит 929c58e38d

Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2007-2009 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2007-2010 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007 Evergrid, Inc. All rights reserved. * Copyright (c) 2007 Evergrid, Inc. All rights reserved.
* Copyright (c) 2008-2010 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2008-2010 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2010 IBM Corporation. All rights reserved. * Copyright (c) 2010 IBM Corporation. All rights reserved.
@ -527,13 +527,23 @@ static int odls_default_fork_local_proc(orte_app_context_t* context,
* to us, so index into the node's array to get the * to us, so index into the node's array to get the
* physical cpu * physical cpu
*/ */
phys_cpu = opal_paffinity_base_get_physical_processor_id(logical_cpu); if (logical_cpu < orte_odls_globals.num_processors) {
if (0 > phys_cpu) { /* We have a processor to bind to */
ORTE_ODLS_IF_BIND_NOT_REQD("bind-to-core"); phys_cpu = opal_paffinity_base_get_physical_processor_id(logical_cpu);
orte_show_help("help-odls-default.txt", if (0 > phys_cpu) {
"odls-default:invalid-phys-cpu", true); ORTE_ODLS_IF_BIND_NOT_REQD("bind-to-core");
ORTE_ODLS_ERROR_OUT(ORTE_ERR_FATAL); orte_show_help("help-odls-default.txt",
} "odls-default:invalid-phys-cpu", true);
ORTE_ODLS_ERROR_OUT(ORTE_ERR_FATAL);
}
} else {
/* No processor to bind to so error out */
orte_show_help("help-odls-default.txt",
"odls-default:not-enough-resources", true,
"processors", orte_process_info.nodename,
"bind-to-core", context->app);
ORTE_ODLS_ERROR_OUT(ORTE_ERR_FATAL);
}
} }
OPAL_PAFFINITY_CPU_SET(phys_cpu, mask); OPAL_PAFFINITY_CPU_SET(phys_cpu, mask);
/* increment logical cpu */ /* increment logical cpu */