Fix a wrong windows path in hpn_contack, which causes problems when looking up in the session directories. Add two more ess module for Windows.
This commit was SVN r23286.
Этот коммит содержится в:
родитель
ae746a390f
Коммит
2e5e9f0a03
12
orte/mca/ess/slave/.windows
Обычный файл
12
orte/mca/ess/slave/.windows
Обычный файл
@ -0,0 +1,12 @@
|
|||||||
|
#
|
||||||
|
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
|
||||||
|
# University of Stuttgart. All rights reserved.
|
||||||
|
# $COPYRIGHT$
|
||||||
|
#
|
||||||
|
# Additional copyrights may follow
|
||||||
|
#
|
||||||
|
# $HEADER$
|
||||||
|
#
|
||||||
|
|
||||||
|
# Specific to this module
|
||||||
|
mca_link_libraries=libopen-rte
|
12
orte/mca/ess/tool/.windows
Обычный файл
12
orte/mca/ess/tool/.windows
Обычный файл
@ -0,0 +1,12 @@
|
|||||||
|
#
|
||||||
|
# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart,
|
||||||
|
# University of Stuttgart. All rights reserved.
|
||||||
|
# $COPYRIGHT$
|
||||||
|
#
|
||||||
|
# Additional copyrights may follow
|
||||||
|
#
|
||||||
|
# $HEADER$
|
||||||
|
#
|
||||||
|
|
||||||
|
# Specific to this module
|
||||||
|
mca_link_libraries=libopen-rte
|
@ -237,7 +237,10 @@ int orte_list_local_hnps(opal_list_t *hnps, bool connect)
|
|||||||
* should end with the "*". Otherwise we will only open the directory
|
* should end with the "*". Otherwise we will only open the directory
|
||||||
* structure (and not the content).
|
* structure (and not the content).
|
||||||
*/
|
*/
|
||||||
hFind = FindFirstFile( headdir, &file_data );
|
char *subdirs = opal_os_path(false, orte_process_info.tmpdir_base, orte_process_info.top_session_dir, "*", NULL);
|
||||||
|
headdir = opal_os_path(false, orte_process_info.tmpdir_base, orte_process_info.top_session_dir, NULL);
|
||||||
|
|
||||||
|
hFind = FindFirstFile( subdirs, &file_data );
|
||||||
if( INVALID_HANDLE_VALUE == hFind ) {
|
if( INVALID_HANDLE_VALUE == hFind ) {
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
@ -258,7 +261,7 @@ int orte_list_local_hnps(opal_list_t *hnps, bool connect)
|
|||||||
* See if a contact file exists in this directory and read it
|
* See if a contact file exists in this directory and read it
|
||||||
*/
|
*/
|
||||||
contact_filename = opal_os_path( false, headdir,
|
contact_filename = opal_os_path( false, headdir,
|
||||||
file_data, "contact.txt", NULL );
|
file_data.cFileName, "contact.txt", NULL );
|
||||||
|
|
||||||
hnp = OBJ_NEW(orte_hnp_contact_t);
|
hnp = OBJ_NEW(orte_hnp_contact_t);
|
||||||
if (ORTE_SUCCESS == (ret = orte_read_hnp_contact_file(contact_filename, hnp, connect))) {
|
if (ORTE_SUCCESS == (ret = orte_read_hnp_contact_file(contact_filename, hnp, connect))) {
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user