Skip to content

Pr/non blocking coll #646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 19, 2015
Merged

Pr/non blocking coll #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
19cac73
first part of the changes trequired to support non-blocking colelctiv…
edgargabriel Jun 1, 2015
100515e
remove split collective interfaces from fcoll and their fake implemen…
edgargabriel Jun 2, 2015
cc21928
checkpoint of the current work, since I need to resync wioth master t…
edgargabriel Jun 18, 2015
3b11a8b
making the current work compile.
edgargabriel Jun 18, 2015
dedeee9
finishing the changes for the non-blocking and split cpllective I/O o…
edgargabriel Jun 18, 2015
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: 2 additions & 6 deletions ompi/mca/fcoll/dynamic/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2008-2011 University of Houston. All rights reserved.
# Copyright (c) 2008-2015 University of Houston. All rights reserved.
# Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$
#
Expand All @@ -23,11 +23,7 @@ sources = \
fcoll_dynamic_module.c \
fcoll_dynamic_component.c \
fcoll_dynamic_file_read_all.c \
fcoll_dynamic_file_read_all_begin.c \
fcoll_dynamic_file_read_all_end.c \
fcoll_dynamic_file_write_all.c \
fcoll_dynamic_file_write_all_begin.c \
fcoll_dynamic_file_write_all_end.c
fcoll_dynamic_file_write_all.c

# Make the output library in this directory, and name it either
# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
Expand Down
16 changes: 0 additions & 16 deletions ompi/mca/fcoll/dynamic/fcoll_dynamic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,29 +54,13 @@ int mca_fcoll_dynamic_file_read_all (mca_io_ompio_file_t *fh,
struct ompi_datatype_t *datatype,
ompi_status_public_t * status);

int mca_fcoll_dynamic_file_read_all_begin (mca_io_ompio_file_t *fh,
void *buf,
int count,
struct ompi_datatype_t *datatype);

int mca_fcoll_dynamic_file_read_all_end (mca_io_ompio_file_t *fh,
void *buf,
ompi_status_public_t * status);

int mca_fcoll_dynamic_file_write_all (mca_io_ompio_file_t *fh,
void *buf,
int count,
struct ompi_datatype_t *datatype,
ompi_status_public_t * status);

int mca_fcoll_dynamic_file_write_all_begin (mca_io_ompio_file_t *fh,
void *buf,
int count,
struct ompi_datatype_t *datatype);

int mca_fcoll_dynamic_file_write_all_end (mca_io_ompio_file_t *fh,
void *buf,
ompi_status_public_t * status);

END_C_DECLS

Expand Down
36 changes: 0 additions & 36 deletions ompi/mca/fcoll/dynamic/fcoll_dynamic_file_read_all_begin.c
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions ompi/mca/fcoll/dynamic/fcoll_dynamic_file_read_all_end.c
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions ompi/mca/fcoll/dynamic/fcoll_dynamic_file_write_all_begin.c
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions ompi/mca/fcoll/dynamic/fcoll_dynamic_file_write_all_end.c
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions ompi/mca/fcoll/dynamic/fcoll_dynamic_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2008-2011 University of Houston. All rights reserved.
* Copyright (c) 2008-2015 University of Houston. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand All @@ -36,11 +36,11 @@ static mca_fcoll_base_module_1_0_0_t dynamic = {
mca_fcoll_dynamic_module_init,
mca_fcoll_dynamic_module_finalize,
mca_fcoll_dynamic_file_read_all,
mca_fcoll_dynamic_file_read_all_begin,
mca_fcoll_dynamic_file_read_all_end,
NULL, /* iread_all */
mca_fcoll_dynamic_file_write_all,
mca_fcoll_dynamic_file_write_all_begin,
mca_fcoll_dynamic_file_write_all_end
NULL, /*iwrite_all */
NULL, /* progress */
NULL /* request_free */
};

int
Expand Down
37 changes: 19 additions & 18 deletions ompi/mca/fcoll/fcoll.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2008-2011 University of Houston. All rights reserved.
* Copyright (c) 2008-2015 University of Houston. All rights reserved.
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
Expand All @@ -27,10 +27,12 @@
#include "mpi.h"
#include "ompi/mca/mca.h"
#include "opal/mca/base/base.h"
#include "ompi/request/request.h"

BEGIN_C_DECLS

struct mca_io_ompio_file_t;
struct mca_fcoll_request_t;

/*
* Macro for use in components that are of type coll
Expand Down Expand Up @@ -115,16 +117,12 @@ typedef int (*mca_fcoll_base_module_file_read_all_fn_t)
struct ompi_datatype_t *datatype,
ompi_status_public_t *status);

typedef int (*mca_fcoll_base_module_file_read_all_begin_fn_t)
typedef int (*mca_fcoll_base_module_file_iread_all_fn_t)
(struct mca_io_ompio_file_t *fh,
void *buf,
int count,
struct ompi_datatype_t *datatype);

typedef int (*mca_fcoll_base_module_file_read_all_end_fn_t)
(struct mca_io_ompio_file_t *fh,
void *buf,
ompi_status_public_t *status);
struct ompi_datatype_t *datatype,
ompi_request_t **request);

typedef int (*mca_fcoll_base_module_file_write_all_fn_t)
(struct mca_io_ompio_file_t *fh,
Expand All @@ -133,16 +131,18 @@ typedef int (*mca_fcoll_base_module_file_write_all_fn_t)
struct ompi_datatype_t *datatype,
ompi_status_public_t *status);

typedef int (*mca_fcoll_base_module_file_write_all_begin_fn_t)
typedef int (*mca_fcoll_base_module_file_iwrite_all_fn_t)
(struct mca_io_ompio_file_t *fh,
void *buf,
int count,
struct ompi_datatype_t *datatype);
struct ompi_datatype_t *datatype,
ompi_request_t **request);

typedef int (*mca_fcoll_base_module_file_write_all_end_fn_t)
(struct mca_io_ompio_file_t *fh,
void *buf,
ompi_status_public_t *status);
typedef bool (*mca_fcoll_base_module_progress_fn_t)
( struct mca_fcoll_request_t *request);

typedef void (*mca_fcoll_base_module_request_free_fn_t)
( struct mca_fcoll_request_t *request);

/*
* ***********************************************************************
Expand All @@ -160,11 +160,12 @@ struct mca_fcoll_base_module_1_0_0_t {

/* FCOLL function pointers */
mca_fcoll_base_module_file_read_all_fn_t fcoll_file_read_all;
mca_fcoll_base_module_file_read_all_begin_fn_t fcoll_file_read_all_begin;
mca_fcoll_base_module_file_read_all_end_fn_t fcoll_file_read_all_end;
mca_fcoll_base_module_file_iread_all_fn_t fcoll_file_iread_all;
mca_fcoll_base_module_file_write_all_fn_t fcoll_file_write_all;
mca_fcoll_base_module_file_write_all_begin_fn_t fcoll_file_write_all_begin;
mca_fcoll_base_module_file_write_all_end_fn_t fcoll_file_write_all_end;
mca_fcoll_base_module_file_iwrite_all_fn_t fcoll_file_iwrite_all;
mca_fcoll_base_module_progress_fn_t fcoll_progress;
mca_fcoll_base_module_request_free_fn_t fcoll_request_free;

};
typedef struct mca_fcoll_base_module_1_0_0_t mca_fcoll_base_module_1_0_0_t;
typedef mca_fcoll_base_module_1_0_0_t mca_fcoll_base_module_t;
Expand Down
8 changes: 2 additions & 6 deletions ompi/mca/fcoll/individual/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2008-2011 University of Houston. All rights reserved.
# Copyright (c) 2008-2015 University of Houston. All rights reserved.
# Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$
#
Expand All @@ -23,11 +23,7 @@ sources = \
fcoll_individual_module.c \
fcoll_individual_component.c \
fcoll_individual_file_read_all.c \
fcoll_individual_file_read_all_begin.c \
fcoll_individual_file_read_all_end.c \
fcoll_individual_file_write_all.c \
fcoll_individual_file_write_all_begin.c \
fcoll_individual_file_write_all_end.c
fcoll_individual_file_write_all.c

# Make the output library in this directory, and name it either
# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
Expand Down
16 changes: 0 additions & 16 deletions ompi/mca/fcoll/individual/fcoll_individual.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,29 +54,13 @@ int mca_fcoll_individual_file_read_all (mca_io_ompio_file_t *fh,
struct ompi_datatype_t *datatype,
ompi_status_public_t * status);

int mca_fcoll_individual_file_read_all_begin (mca_io_ompio_file_t *fh,
void *buf,
int count,
struct ompi_datatype_t *datatype);

int mca_fcoll_individual_file_read_all_end (mca_io_ompio_file_t *fh,
void *buf,
ompi_status_public_t * status);

int mca_fcoll_individual_file_write_all (mca_io_ompio_file_t *fh,
void *buf,
int count,
struct ompi_datatype_t *datatype,
ompi_status_public_t * status);

int mca_fcoll_individual_file_write_all_begin (mca_io_ompio_file_t *fh,
void *buf,
int count,
struct ompi_datatype_t *datatype);

int mca_fcoll_individual_file_write_all_end (mca_io_ompio_file_t *fh,
void *buf,
ompi_status_public_t * status);

END_C_DECLS

Expand Down
36 changes: 0 additions & 36 deletions ompi/mca/fcoll/individual/fcoll_individual_file_read_all_begin.c
View file
Open in desktop

This file was deleted.

Loading