Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,8 @@ Makefile.am-stamp
/src/binding/fortran/use_mpi/mpif90type.h
/src/binding/fortran/use_mpi/mpi_constants.f90
/src/binding/fortran/use_mpi/mpifnoext.h
/src/binding/fortran/use_mpi/pmpi_base.f90
/src/binding/fortran/use_mpi/pmpi_base.mod-stamp

# generated by src/binding/fortran/use_mpi_f08/buildiface
/src/binding/fortran/use_mpi_f08/mpi_f08_compile_constants.f90
Expand Down Expand Up @@ -615,6 +617,14 @@ Makefile.am-stamp
/src/mpid/ch4/shm/stubshm/shm_inline.h
/src/mpid/ch4/shm/stubshm/shm_noinline.h
/src/mpid/ch4/shm/stubshm/stubshm_noinline.c
/src/mpid/ch4/shm/posix/eager/include/posix_eager.h
/src/mpid/ch4/shm/posix/eager/iqueue/func_table.c
/src/mpid/ch4/shm/posix/eager/iqueue/iqueue_noinline.h
/src/mpid/ch4/shm/posix/eager/src/posix_eager_impl.c
/src/mpid/ch4/shm/posix/eager/stub/func_table.c
/src/mpid/ch4/shm/posix/eager/stub/stub_inline.h
/src/mpid/ch4/shm/posix/eager/stub/stub_noinline.c
/src/mpid/ch4/shm/posix/eager/stub/stub_noinline.h

src/pm/hydra/lib/tools/bootstrap/src/bsci_init.c
src/pmi/aclocal.m4
Expand Down
10 changes: 10 additions & 0 deletions src/include/mpir_csel.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@ typedef enum {
MPIR_CSEL_COLL_TYPE__END,
} MPIR_Csel_coll_type_e;

typedef enum {
MPIR_CSEL_COMM_HIERARCHY__FLAT = 0,
MPIR_CSEL_COMM_HIERARCHY__NODE,
MPIR_CSEL_COMM_HIERARCHY__NODE_ROOTS,
MPIR_CSEL_COMM_HIERARCHY__PARENT,
MPIR_CSEL_COMM_HIERARCHY__END,
} MPIR_Csel_comm_hierarchy_e;

typedef struct {
MPIR_Csel_coll_type_e coll_type;
MPIR_Comm *comm_ptr;
Expand Down Expand Up @@ -209,4 +217,6 @@ int MPIR_Csel_free(void *csel);
int MPIR_Csel_prune(void *root_csel, MPIR_Comm * comm_ptr, void **comm_csel);
void *MPIR_Csel_search(void *csel, MPIR_Csel_coll_sig_s coll_sig);

void MPIR_Csel_debug_summary(const char *name, void *csel_);

#endif /* MPIR_CSEL_H_INCLUDED */
52 changes: 52 additions & 0 deletions src/mpi/coll/include/csel_container.h
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,50 @@ typedef enum {
MPII_CSEL_CONTAINER_TYPE__ALGORITHM__MPIR_Scatter_allcomm_nb,
MPII_CSEL_CONTAINER_TYPE__ALGORITHM__MPIR_Scatterv_allcomm_linear,
MPII_CSEL_CONTAINER_TYPE__ALGORITHM__MPIR_Scatterv_allcomm_nb,

MPII_CSEL_CONTAINER_TYPE__ALGORITHM__MPIDI_POSIX_mpi_bcast_release_gather,
MPII_CSEL_CONTAINER_TYPE__ALGORITHM__MPIDI_POSIX_mpi_bcast_ipc_read,
MPII_CSEL_CONTAINER_TYPE__ALGORITHM__MPIR_Bcast_impl,
MPII_CSEL_CONTAINER_TYPE__ALGORITHM__MPIDI_POSIX_mpi_barrier_release_gather,
MPII_CSEL_CONTAINER_TYPE__ALGORITHM__MPIR_Barrier_impl,
MPII_CSEL_CONTAINER_TYPE__ALGORITHM__MPIDI_POSIX_mpi_allreduce_release_gather,
MPII_CSEL_CONTAINER_TYPE__ALGORITHM__MPIR_Allreduce_impl,
MPII_CSEL_CONTAINER_TYPE__ALGORITHM__MPIDI_POSIX_mpi_reduce_release_gather,
MPII_CSEL_CONTAINER_TYPE__ALGORITHM__MPIR_Reduce_impl,

MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Barrier_intra_composition_alpha,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Barrier_intra_composition_beta,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Bcast_intra_composition_alpha,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Bcast_intra_composition_beta,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Bcast_intra_composition_gamma,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Bcast_intra_composition_delta,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Reduce_intra_composition_alpha,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Reduce_intra_composition_beta,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Reduce_intra_composition_gamma,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Allreduce_intra_composition_alpha,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Allreduce_intra_composition_beta,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Allreduce_intra_composition_gamma,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Allreduce_intra_composition_delta,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Alltoall_intra_composition_alpha,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Alltoall_intra_composition_beta,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Alltoallv_intra_composition_alpha,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Alltoallw_intra_composition_alpha,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Allgather_intra_composition_alpha,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Allgather_intra_composition_beta,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Allgatherv_intra_composition_alpha,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Gather_intra_composition_alpha,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Gatherv_intra_composition_alpha,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Scatter_intra_composition_alpha,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Scatterv_intra_composition_alpha,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Reduce_scatter_intra_composition_alpha,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Reduce_scatter_block_intra_composition_alpha,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Scan_intra_composition_alpha,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Scan_intra_composition_beta,
MPII_CSEL_CONTAINER_TYPE__COMPOSITION__MPIDI_Exscan_intra_composition_alpha,

MPII_CSEL_CONTAINER_TYPE__ALGORITHM__MPIDI_OFI_Bcast_intra_triggered_tagged,
MPII_CSEL_CONTAINER_TYPE__ALGORITHM__MPIDI_OFI_Bcast_intra_triggered_rma,

MPII_CSEL_CONTAINER_TYPE__ALGORITHM__Algorithm_count,
} MPII_Csel_container_type_e;

Expand Down Expand Up @@ -325,6 +369,14 @@ typedef struct {
int chunk_size;
int recv_pre_posted;
} intra_pipelined_tree;
struct {
int k;
int tree_type;
} triggered_tagged;
struct {
int k;
int tree_type;
} triggered_rma;
} bcast;
struct {
struct {
Expand Down
2 changes: 2 additions & 0 deletions src/mpi/coll/src/Makefile.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,7 @@
mpi_core_sources += \
src/mpi/coll/src/coll_impl.c \
src/mpi/coll/src/csel.c \
src/mpi/coll/src/csel_print.c \
src/mpi/coll/src/csel_constants.c \
src/mpi/coll/src/csel_container.c \
src/mpi/coll/src/csel_json_autogen.c
1 change: 1 addition & 0 deletions src/mpi/coll/src/coll_impl.c
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ int MPII_Coll_init(void)
MPII_Create_container, &MPIR_Csel_root);
MPIR_Csel_source = MPIR_CVAR_COLL_SELECTION_TUNING_JSON_FILE;
}
MPIR_Csel_debug_summary(MPIR_Csel_source, MPIR_Csel_root);
MPIR_ERR_CHECK(mpi_errno);

fn_exit:
Expand Down
Loading