Skip to content
This repository was archived by the owner on Sep 30, 2022. It is now read-only.

spml/yoda: MCA_PML(add_procs) all procs from oshmem_comm_world #1323

Merged
merged 1 commit into from
Aug 17, 2016
Merged

spml/yoda: MCA_PML(add_procs) all procs from oshmem_comm_world #1323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion oshmem/mca/spml/yoda/spml_yoda.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*
* Copyright (c) 2013-2015 Mellanox Technologies, Inc.
* All rights reserved.
* Copyright (c) 2014 Research Organization for Information Science
* Copyright (c) 2014-2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
* reserved.
Expand Down Expand Up @@ -640,6 +640,12 @@ int mca_spml_yoda_add_procs(oshmem_proc_t** procs, size_t nprocs)
goto cleanup_and_return;
}

/* create_btl_idx requires the proc was add_proc'ed, so do it now */
rc = MCA_PML_CALL(add_procs(procs, nprocs));
if (OMPI_SUCCESS != rc) {
goto cleanup_and_return;
}

/* create btl index and map */
rc = create_btl_list();
if (OSHMEM_SUCCESS != rc) {
Expand Down
9 changes: 4 additions & 5 deletions oshmem/proc/proc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
* Copyright (c) 2013 Mellanox Technologies, Inc.
* All rights reserved.
* Copyright (c) 2014-2015 Research Organization for Information Science
* Copyright (c) 2014-2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2016 ARM, Inc. All rights reserved.
* $COPYRIGHT$
*
Expand Down Expand Up @@ -79,8 +79,7 @@ int oshmem_proc_group_init(void)
== (oshmem_group_all =
oshmem_proc_group_create(0,
1,
oshmem_num_procs()))) {
oshmem_proc_group_destroy(oshmem_group_all);
ompi_comm_size(oshmem_comm_world)))) {
return OSHMEM_ERROR;
}

Expand Down Expand Up @@ -151,7 +150,7 @@ oshmem_group_t* oshmem_proc_group_create(int pe_start,

group->my_pe = oshmem_proc_pe(oshmem_proc_local());
group->is_member = 0;
for (i = 0 ; i < oshmem_num_procs() ; i++) {
for (i = 0 ; i < ompi_comm_size(oshmem_comm_world) ; i++) {
proc = oshmem_proc_find(i);
if (NULL == proc) {
opal_output(0,
Expand Down