diff --git a/ompi/mca/fcoll/dynamic/Makefile.am b/ompi/mca/fcoll/dynamic/Makefile.am index ded959c98d..c983c24d84 100644 --- a/ompi/mca/fcoll/dynamic/Makefile.am +++ b/ompi/mca/fcoll/dynamic/Makefile.am @@ -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$ # @@ -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__.la (for DSO builds) or libmca__.la diff --git a/ompi/mca/fcoll/dynamic/fcoll_dynamic.h b/ompi/mca/fcoll/dynamic/fcoll_dynamic.h index 99b8a2a4d0..62c70606bd 100644 --- a/ompi/mca/fcoll/dynamic/fcoll_dynamic.h +++ b/ompi/mca/fcoll/dynamic/fcoll_dynamic.h @@ -54,14 +54,6 @@ 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, @@ -69,14 +61,6 @@ int mca_fcoll_dynamic_file_write_all (mca_io_ompio_file_t *fh, 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 diff --git a/ompi/mca/fcoll/dynamic/fcoll_dynamic_file_read_all_begin.c b/ompi/mca/fcoll/dynamic/fcoll_dynamic_file_read_all_begin.c deleted file mode 100644 index 1faffe7c6d..0000000000 --- a/ompi/mca/fcoll/dynamic/fcoll_dynamic_file_read_all_begin.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * 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$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#include "ompi_config.h" -#include "fcoll_dynamic.h" - -#include "mpi.h" -#include "ompi/constants.h" -#include "ompi/mca/fcoll/fcoll.h" - - -int -mca_fcoll_dynamic_file_read_all_begin (mca_io_ompio_file_t *fh, - void *buf, - int count, - struct ompi_datatype_t *datatype) -{ - printf ("DYNAMIC READ ALL BEGIN\n"); - return OMPI_SUCCESS; -} diff --git a/ompi/mca/fcoll/dynamic/fcoll_dynamic_file_read_all_end.c b/ompi/mca/fcoll/dynamic/fcoll_dynamic_file_read_all_end.c deleted file mode 100644 index e4ecd3b4c7..0000000000 --- a/ompi/mca/fcoll/dynamic/fcoll_dynamic_file_read_all_end.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * 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$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#include "ompi_config.h" -#include "fcoll_dynamic.h" - -#include "mpi.h" -#include "ompi/constants.h" -#include "ompi/mca/fcoll/fcoll.h" - - -int -mca_fcoll_dynamic_file_read_all_end (mca_io_ompio_file_t *fh, - void *buf, - ompi_status_public_t *status) -{ - printf ("DYNAMIC READ ALL END\n"); - return OMPI_SUCCESS; -} diff --git a/ompi/mca/fcoll/dynamic/fcoll_dynamic_file_write_all_begin.c b/ompi/mca/fcoll/dynamic/fcoll_dynamic_file_write_all_begin.c deleted file mode 100644 index af59fae369..0000000000 --- a/ompi/mca/fcoll/dynamic/fcoll_dynamic_file_write_all_begin.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * 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$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#include "ompi_config.h" -#include "fcoll_dynamic.h" - -#include "mpi.h" -#include "ompi/constants.h" -#include "ompi/mca/fcoll/fcoll.h" - - -int -mca_fcoll_dynamic_file_write_all_begin (mca_io_ompio_file_t *fh, - void *buf, - int count, - struct ompi_datatype_t *datatype) -{ - printf ("DYNAMIC WRITE ALL BEGIN\n"); - return OMPI_SUCCESS; -} diff --git a/ompi/mca/fcoll/dynamic/fcoll_dynamic_file_write_all_end.c b/ompi/mca/fcoll/dynamic/fcoll_dynamic_file_write_all_end.c deleted file mode 100644 index 9a6a554d82..0000000000 --- a/ompi/mca/fcoll/dynamic/fcoll_dynamic_file_write_all_end.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * 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$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#include "ompi_config.h" -#include "fcoll_dynamic.h" - -#include "mpi.h" -#include "ompi/constants.h" -#include "ompi/mca/fcoll/fcoll.h" - - -int -mca_fcoll_dynamic_file_write_all_end (mca_io_ompio_file_t *fh, - void *buf, - ompi_status_public_t *status) -{ - printf ("DYNAMIC WRITE ALL END\n"); - return OMPI_SUCCESS; -} diff --git a/ompi/mca/fcoll/dynamic/fcoll_dynamic_module.c b/ompi/mca/fcoll/dynamic/fcoll_dynamic_module.c index e0d6d68f3b..c70d422542 100644 --- a/ompi/mca/fcoll/dynamic/fcoll_dynamic_module.c +++ b/ompi/mca/fcoll/dynamic/fcoll_dynamic_module.c @@ -37,12 +37,17 @@ static mca_fcoll_base_module_1_0_0_t dynamic = { mca_fcoll_dynamic_module_finalize, mca_fcoll_dynamic_file_read_all, NULL, /* iread_all */ +<<<<<<< HEAD + mca_fcoll_dynamic_file_write_all, + NULL, /*iwrite_all */ +======= mca_fcoll_dynamic_file_read_all_begin, mca_fcoll_dynamic_file_read_all_end, mca_fcoll_dynamic_file_write_all, NULL, /*iwrite_all */ mca_fcoll_dynamic_file_write_all_begin, mca_fcoll_dynamic_file_write_all_end, +>>>>>>> ff02f765b276ffd0dfd12ba50e85e70fa3db7aca NULL, /* progress */ NULL /* request_free */ }; diff --git a/ompi/mca/fcoll/fcoll.h b/ompi/mca/fcoll/fcoll.h index 3eb273adff..066264441d 100644 --- a/ompi/mca/fcoll/fcoll.h +++ b/ompi/mca/fcoll/fcoll.h @@ -118,6 +118,8 @@ typedef int (*mca_fcoll_base_module_file_read_all_fn_t) ompi_status_public_t *status); typedef int (*mca_fcoll_base_module_file_iread_all_fn_t) +<<<<<<< HEAD +======= (struct mca_io_ompio_file_t *fh, void *buf, int count, @@ -125,15 +127,12 @@ typedef int (*mca_fcoll_base_module_file_iread_all_fn_t) ompi_request_t **request); typedef int (*mca_fcoll_base_module_file_read_all_begin_fn_t) +>>>>>>> ff02f765b276ffd0dfd12ba50e85e70fa3db7aca (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, @@ -143,6 +142,8 @@ typedef int (*mca_fcoll_base_module_file_write_all_fn_t) ompi_status_public_t *status); typedef int (*mca_fcoll_base_module_file_iwrite_all_fn_t) +<<<<<<< HEAD +======= (struct mca_io_ompio_file_t *fh, void *buf, int count, @@ -150,15 +151,19 @@ typedef int (*mca_fcoll_base_module_file_iwrite_all_fn_t) ompi_request_t **request); typedef int (*mca_fcoll_base_module_file_write_all_begin_fn_t) +>>>>>>> ff02f765b276ffd0dfd12ba50e85e70fa3db7aca (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 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); -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); @@ -184,12 +189,17 @@ 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_iread_all_fn_t fcoll_file_iread_all; +<<<<<<< HEAD + mca_fcoll_base_module_file_write_all_fn_t fcoll_file_write_all; + mca_fcoll_base_module_file_iwrite_all_fn_t fcoll_file_iwrite_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_write_all_fn_t fcoll_file_write_all; mca_fcoll_base_module_file_iwrite_all_fn_t fcoll_file_iwrite_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; +>>>>>>> ff02f765b276ffd0dfd12ba50e85e70fa3db7aca mca_fcoll_base_module_progress_fn_t fcoll_progress; mca_fcoll_base_module_request_free_fn_t fcoll_request_free; diff --git a/ompi/mca/fcoll/individual/Makefile.am b/ompi/mca/fcoll/individual/Makefile.am index 1f976f594f..727e3f52f3 100644 --- a/ompi/mca/fcoll/individual/Makefile.am +++ b/ompi/mca/fcoll/individual/Makefile.am @@ -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$ # @@ -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__.la (for DSO builds) or libmca__.la diff --git a/ompi/mca/fcoll/individual/fcoll_individual.h b/ompi/mca/fcoll/individual/fcoll_individual.h index c9c9e6d2d7..9ae1f96785 100644 --- a/ompi/mca/fcoll/individual/fcoll_individual.h +++ b/ompi/mca/fcoll/individual/fcoll_individual.h @@ -54,14 +54,6 @@ 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, @@ -69,14 +61,6 @@ int mca_fcoll_individual_file_write_all (mca_io_ompio_file_t *fh, 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 diff --git a/ompi/mca/fcoll/individual/fcoll_individual_file_read_all_begin.c b/ompi/mca/fcoll/individual/fcoll_individual_file_read_all_begin.c deleted file mode 100644 index 311574f0ec..0000000000 --- a/ompi/mca/fcoll/individual/fcoll_individual_file_read_all_begin.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * 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$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#include "ompi_config.h" -#include "fcoll_individual.h" - -#include "mpi.h" -#include "ompi/constants.h" -#include "ompi/mca/fcoll/fcoll.h" - - -int -mca_fcoll_individual_file_read_all_begin (mca_io_ompio_file_t *fh, - void *buf, - int count, - struct ompi_datatype_t *datatype) -{ - printf ("INDIVIDUAL READ ALL BEGIN\n"); - return OMPI_SUCCESS; -} diff --git a/ompi/mca/fcoll/individual/fcoll_individual_file_read_all_end.c b/ompi/mca/fcoll/individual/fcoll_individual_file_read_all_end.c deleted file mode 100644 index d9b1f7a08d..0000000000 --- a/ompi/mca/fcoll/individual/fcoll_individual_file_read_all_end.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * 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$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#include "ompi_config.h" -#include "fcoll_individual.h" - -#include "mpi.h" -#include "ompi/constants.h" -#include "ompi/mca/fcoll/fcoll.h" - - -int -mca_fcoll_individual_file_read_all_end (mca_io_ompio_file_t *fh, - void *buf, - ompi_status_public_t *status) -{ - printf ("INDIVIDUAL READ ALL END\n"); - return OMPI_SUCCESS; -} diff --git a/ompi/mca/fcoll/individual/fcoll_individual_file_write_all_begin.c b/ompi/mca/fcoll/individual/fcoll_individual_file_write_all_begin.c deleted file mode 100644 index 75050387d2..0000000000 --- a/ompi/mca/fcoll/individual/fcoll_individual_file_write_all_begin.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * 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$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#include "ompi_config.h" -#include "fcoll_individual.h" - -#include "mpi.h" -#include "ompi/constants.h" -#include "ompi/mca/fcoll/fcoll.h" - - -int -mca_fcoll_individual_file_write_all_begin (mca_io_ompio_file_t *fh, - void *buf, - int count, - struct ompi_datatype_t *datatype) -{ - printf ("INDIVIDUAL WRITE ALL BEGIN\n"); - return OMPI_SUCCESS; -} diff --git a/ompi/mca/fcoll/individual/fcoll_individual_file_write_all_end.c b/ompi/mca/fcoll/individual/fcoll_individual_file_write_all_end.c deleted file mode 100644 index b080e801a5..0000000000 --- a/ompi/mca/fcoll/individual/fcoll_individual_file_write_all_end.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * 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$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#include "ompi_config.h" -#include "fcoll_individual.h" - -#include "mpi.h" -#include "ompi/constants.h" -#include "ompi/mca/fcoll/fcoll.h" - - -int -mca_fcoll_individual_file_write_all_end (mca_io_ompio_file_t *fh, - void *buf, - ompi_status_public_t *status) -{ - printf ("INDIVIDUAL WRITE ALL END\n"); - return OMPI_SUCCESS; -} diff --git a/ompi/mca/fcoll/individual/fcoll_individual_module.c b/ompi/mca/fcoll/individual/fcoll_individual_module.c index 200a7566a8..d755e06e70 100644 --- a/ompi/mca/fcoll/individual/fcoll_individual_module.c +++ b/ompi/mca/fcoll/individual/fcoll_individual_module.c @@ -37,12 +37,17 @@ static mca_fcoll_base_module_1_0_0_t individual = { mca_fcoll_individual_module_finalize, mca_fcoll_individual_file_read_all, NULL, /* iread_all */ +<<<<<<< HEAD + mca_fcoll_individual_file_write_all, + NULL, /* iwrite_all */ +======= mca_fcoll_individual_file_read_all_begin, mca_fcoll_individual_file_read_all_end, mca_fcoll_individual_file_write_all, NULL, /* iwrite_all */ mca_fcoll_individual_file_write_all_begin, mca_fcoll_individual_file_write_all_end, +>>>>>>> ff02f765b276ffd0dfd12ba50e85e70fa3db7aca NULL, /* progress */ NULL /* request_free */ }; diff --git a/ompi/mca/fcoll/static/Makefile.am b/ompi/mca/fcoll/static/Makefile.am index 4b4e8f451a..ee01ac7ec2 100644 --- a/ompi/mca/fcoll/static/Makefile.am +++ b/ompi/mca/fcoll/static/Makefile.am @@ -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$ # @@ -23,11 +23,7 @@ sources = \ fcoll_static_module.c \ fcoll_static_component.c \ fcoll_static_file_read_all.c \ - fcoll_static_file_read_all_begin.c \ - fcoll_static_file_read_all_end.c \ - fcoll_static_file_write_all.c \ - fcoll_static_file_write_all_begin.c \ - fcoll_static_file_write_all_end.c + fcoll_static_file_write_all.c # Make the output library in this directory, and name it either # mca__.la (for DSO builds) or libmca__.la diff --git a/ompi/mca/fcoll/static/fcoll_static.h b/ompi/mca/fcoll/static/fcoll_static.h index 3d461f0f70..be03c032ea 100644 --- a/ompi/mca/fcoll/static/fcoll_static.h +++ b/ompi/mca/fcoll/static/fcoll_static.h @@ -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-2014 University of Houston. All rights reserved. + * Copyright (c) 2008-2015 University of Houston. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -53,14 +53,6 @@ int mca_fcoll_static_file_read_all (mca_io_ompio_file_t *fh, struct ompi_datatype_t *datatype, ompi_status_public_t * status); -int mca_fcoll_static_file_read_all_begin (mca_io_ompio_file_t *fh, - void *buf, - int count, - struct ompi_datatype_t *datatype); - -int mca_fcoll_static_file_read_all_end (mca_io_ompio_file_t *fh, - void *buf, - ompi_status_public_t * status); int mca_fcoll_static_file_write_all (mca_io_ompio_file_t *fh, void *buf, @@ -68,14 +60,6 @@ int mca_fcoll_static_file_write_all (mca_io_ompio_file_t *fh, struct ompi_datatype_t *datatype, ompi_status_public_t * status); -int mca_fcoll_static_file_write_all_begin (mca_io_ompio_file_t *fh, - void *buf, - int count, - struct ompi_datatype_t *datatype); - -int mca_fcoll_static_file_write_all_end (mca_io_ompio_file_t *fh, - void *buf, - ompi_status_public_t * status); END_C_DECLS diff --git a/ompi/mca/fcoll/static/fcoll_static_file_read_all_begin.c b/ompi/mca/fcoll/static/fcoll_static_file_read_all_begin.c deleted file mode 100644 index a383ce9b76..0000000000 --- a/ompi/mca/fcoll/static/fcoll_static_file_read_all_begin.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * 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$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#include "ompi_config.h" -#include "fcoll_static.h" - -#include "mpi.h" -#include "ompi/constants.h" -#include "ompi/mca/fcoll/fcoll.h" - - -int -mca_fcoll_static_file_read_all_begin (mca_io_ompio_file_t *fh, - void *buf, - int count, - struct ompi_datatype_t *datatype) -{ - printf ("STATIC READ ALL BEGIN\n"); - return OMPI_SUCCESS; -} diff --git a/ompi/mca/fcoll/static/fcoll_static_file_read_all_end.c b/ompi/mca/fcoll/static/fcoll_static_file_read_all_end.c deleted file mode 100644 index 7d3101cd2f..0000000000 --- a/ompi/mca/fcoll/static/fcoll_static_file_read_all_end.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * 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$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#include "ompi_config.h" -#include "fcoll_static.h" - -#include "mpi.h" -#include "ompi/constants.h" -#include "ompi/mca/fcoll/fcoll.h" - - -int -mca_fcoll_static_file_read_all_end (mca_io_ompio_file_t *fh, - void *buf, - ompi_status_public_t *status) -{ - printf ("STATIC READ ALL END\n"); - return OMPI_SUCCESS; -} diff --git a/ompi/mca/fcoll/static/fcoll_static_file_write_all_begin.c b/ompi/mca/fcoll/static/fcoll_static_file_write_all_begin.c deleted file mode 100644 index 5828974b3c..0000000000 --- a/ompi/mca/fcoll/static/fcoll_static_file_write_all_begin.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * 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$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#include "ompi_config.h" -#include "fcoll_static.h" - -#include "mpi.h" -#include "ompi/constants.h" -#include "ompi/mca/fcoll/fcoll.h" - - -int -mca_fcoll_static_file_write_all_begin (mca_io_ompio_file_t *fh, - void *buf, - int count, - struct ompi_datatype_t *datatype) -{ - printf ("STATIC WRITE ALL BEGIN\n"); - return OMPI_SUCCESS; -} diff --git a/ompi/mca/fcoll/static/fcoll_static_file_write_all_end.c b/ompi/mca/fcoll/static/fcoll_static_file_write_all_end.c deleted file mode 100644 index 3c36d19c8b..0000000000 --- a/ompi/mca/fcoll/static/fcoll_static_file_write_all_end.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * 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$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#include "ompi_config.h" -#include "fcoll_static.h" - -#include "mpi.h" -#include "ompi/constants.h" -#include "ompi/mca/fcoll/fcoll.h" - - -int -mca_fcoll_static_file_write_all_end (mca_io_ompio_file_t *fh, - void *buf, - ompi_status_public_t *status) -{ - printf ("STATIC WRITE ALL END\n"); - return OMPI_SUCCESS; -} diff --git a/ompi/mca/fcoll/static/fcoll_static_module.c b/ompi/mca/fcoll/static/fcoll_static_module.c index f929027b26..b3e17db131 100644 --- a/ompi/mca/fcoll/static/fcoll_static_module.c +++ b/ompi/mca/fcoll/static/fcoll_static_module.c @@ -37,12 +37,17 @@ static mca_fcoll_base_module_1_0_0_t static_t = { mca_fcoll_static_module_finalize, mca_fcoll_static_file_read_all, NULL, /* iread_all */ +<<<<<<< HEAD + mca_fcoll_static_file_write_all, + NULL, /* iwrite_all */ +======= mca_fcoll_static_file_read_all_begin, mca_fcoll_static_file_read_all_end, mca_fcoll_static_file_write_all, NULL, /* iwrite_all */ mca_fcoll_static_file_write_all_begin, mca_fcoll_static_file_write_all_end, +>>>>>>> ff02f765b276ffd0dfd12ba50e85e70fa3db7aca NULL, /* progress */ NULL /* request_free */ }; diff --git a/ompi/mca/fcoll/two_phase/Makefile.am b/ompi/mca/fcoll/two_phase/Makefile.am index 08003efc73..5a14494700 100644 --- a/ompi/mca/fcoll/two_phase/Makefile.am +++ b/ompi/mca/fcoll/two_phase/Makefile.am @@ -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$ # @@ -23,12 +23,8 @@ sources = \ fcoll_two_phase_module.c \ fcoll_two_phase_component.c \ fcoll_two_phase_file_read_all.c \ - fcoll_two_phase_file_read_all_begin.c \ - fcoll_two_phase_file_read_all_end.c \ fcoll_two_phase_file_write_all.c \ - fcoll_two_phase_file_write_all_begin.c \ - fcoll_two_phase_support_fns.c \ - fcoll_two_phase_file_write_all_end.c + fcoll_two_phase_support_fns.c # Make the output library in this directory, and name it either # mca__.la (for DSO builds) or libmca__.la diff --git a/ompi/mca/fcoll/two_phase/fcoll_two_phase.h b/ompi/mca/fcoll/two_phase/fcoll_two_phase.h index 8619903e0e..61c88f8658 100644 --- a/ompi/mca/fcoll/two_phase/fcoll_two_phase.h +++ b/ompi/mca/fcoll/two_phase/fcoll_two_phase.h @@ -54,14 +54,6 @@ int mca_fcoll_two_phase_file_read_all (mca_io_ompio_file_t *fh, struct ompi_datatype_t *datatype, ompi_status_public_t * status); -int mca_fcoll_two_phase_file_read_all_begin (mca_io_ompio_file_t *fh, - void *buf, - int count, - struct ompi_datatype_t *datatype); - -int mca_fcoll_two_phase_file_read_all_end (mca_io_ompio_file_t *fh, - void *buf, - ompi_status_public_t * status); int mca_fcoll_two_phase_file_write_all (mca_io_ompio_file_t *fh, void *buf, @@ -69,14 +61,6 @@ int mca_fcoll_two_phase_file_write_all (mca_io_ompio_file_t *fh, struct ompi_datatype_t *datatype, ompi_status_public_t * status); -int mca_fcoll_two_phase_file_write_all_begin (mca_io_ompio_file_t *fh, - void *buf, - int count, - struct ompi_datatype_t *datatype); - -int mca_fcoll_two_phase_file_write_all_end (mca_io_ompio_file_t *fh, - void *buf, - ompi_status_public_t * status); int mca_fcoll_two_phase_calc_aggregator (mca_io_ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE off, diff --git a/ompi/mca/fcoll/two_phase/fcoll_two_phase_file_read_all_begin.c b/ompi/mca/fcoll/two_phase/fcoll_two_phase_file_read_all_begin.c deleted file mode 100644 index e41ac3d658..0000000000 --- a/ompi/mca/fcoll/two_phase/fcoll_two_phase_file_read_all_begin.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * 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$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#include "ompi_config.h" -#include "fcoll_two_phase.h" - -#include "mpi.h" -#include "ompi/constants.h" -#include "ompi/mca/fcoll/fcoll.h" - - -int -mca_fcoll_two_phase_file_read_all_begin (mca_io_ompio_file_t *fh, - void *buf, - int count, - struct ompi_datatype_t *datatype) -{ - printf ("DYNAMIC READ ALL BEGIN\n"); - return OMPI_SUCCESS; -} diff --git a/ompi/mca/fcoll/two_phase/fcoll_two_phase_file_read_all_end.c b/ompi/mca/fcoll/two_phase/fcoll_two_phase_file_read_all_end.c deleted file mode 100644 index d4dbaf4229..0000000000 --- a/ompi/mca/fcoll/two_phase/fcoll_two_phase_file_read_all_end.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * 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$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#include "ompi_config.h" -#include "fcoll_two_phase.h" - -#include "mpi.h" -#include "ompi/constants.h" -#include "ompi/mca/fcoll/fcoll.h" - - -int -mca_fcoll_two_phase_file_read_all_end (mca_io_ompio_file_t *fh, - void *buf, - ompi_status_public_t *status) -{ - printf ("DYNAMIC READ ALL END\n"); - return OMPI_SUCCESS; -} diff --git a/ompi/mca/fcoll/two_phase/fcoll_two_phase_file_write_all_begin.c b/ompi/mca/fcoll/two_phase/fcoll_two_phase_file_write_all_begin.c deleted file mode 100644 index 05f057e965..0000000000 --- a/ompi/mca/fcoll/two_phase/fcoll_two_phase_file_write_all_begin.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * 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$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#include "ompi_config.h" -#include "fcoll_two_phase.h" - -#include "mpi.h" -#include "ompi/constants.h" -#include "ompi/mca/fcoll/fcoll.h" - - -int -mca_fcoll_two_phase_file_write_all_begin (mca_io_ompio_file_t *fh, - void *buf, - int count, - struct ompi_datatype_t *datatype) -{ - printf ("DYNAMIC WRITE ALL BEGIN\n"); - return OMPI_SUCCESS; -} diff --git a/ompi/mca/fcoll/two_phase/fcoll_two_phase_file_write_all_end.c b/ompi/mca/fcoll/two_phase/fcoll_two_phase_file_write_all_end.c deleted file mode 100644 index 687ef8a054..0000000000 --- a/ompi/mca/fcoll/two_phase/fcoll_two_phase_file_write_all_end.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * 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$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#include "ompi_config.h" -#include "fcoll_two_phase.h" - -#include "mpi.h" -#include "ompi/constants.h" -#include "ompi/mca/fcoll/fcoll.h" - - -int -mca_fcoll_two_phase_file_write_all_end (mca_io_ompio_file_t *fh, - void *buf, - ompi_status_public_t *status) -{ - printf ("DYNAMIC WRITE ALL END\n"); - return OMPI_SUCCESS; -} diff --git a/ompi/mca/fcoll/two_phase/fcoll_two_phase_module.c b/ompi/mca/fcoll/two_phase/fcoll_two_phase_module.c index 58fd22c31b..f5a5292573 100644 --- a/ompi/mca/fcoll/two_phase/fcoll_two_phase_module.c +++ b/ompi/mca/fcoll/two_phase/fcoll_two_phase_module.c @@ -36,6 +36,11 @@ static mca_fcoll_base_module_1_0_0_t two_phase = { mca_fcoll_two_phase_module_init, mca_fcoll_two_phase_module_finalize, mca_fcoll_two_phase_file_read_all, +<<<<<<< HEAD + NULL, /* iread_all */ + mca_fcoll_two_phase_file_write_all, + NULL, /* iwrite_all */ +======= NULL, mca_fcoll_two_phase_file_read_all_begin, mca_fcoll_two_phase_file_read_all_end, @@ -43,6 +48,7 @@ static mca_fcoll_base_module_1_0_0_t two_phase = { NULL, mca_fcoll_two_phase_file_write_all_begin, mca_fcoll_two_phase_file_write_all_end, +>>>>>>> ff02f765b276ffd0dfd12ba50e85e70fa3db7aca NULL, /* progress */ NULL /* request_free */ }; diff --git a/ompi/mca/io/ompio/io_ompio_file_read.c b/ompi/mca/io/ompio/io_ompio_file_read.c index 4dfd875179..6d7b5eabc9 100644 --- a/ompi/mca/io/ompio/io_ompio_file_read.c +++ b/ompi/mca/io/ompio/io_ompio_file_read.c @@ -557,11 +557,6 @@ int mca_io_ompio_file_read_all_begin (ompi_file_t *fh, data = (mca_io_ompio_data_t *) fh->f_io_selected_data; - ret = data->ompio_fh. - f_fcoll->fcoll_file_read_all_begin (&data->ompio_fh, - buf, - count, - datatype); return ret; } @@ -575,11 +570,6 @@ int mca_io_ompio_file_read_all_end (ompi_file_t *fh, data = (mca_io_ompio_data_t *) fh->f_io_selected_data; - ret = data->ompio_fh. - f_fcoll->fcoll_file_read_all_end (&data->ompio_fh, - buf, - status); - return ret; } @@ -593,7 +583,6 @@ int mca_io_ompio_file_read_at_all_begin (ompi_file_t *fh, mca_io_ompio_data_t *data; data = (mca_io_ompio_data_t *) fh->f_io_selected_data; - ret = ompio_io_ompio_file_read_at_all_begin(&data->ompio_fh,offset,buf,count,datatype); return ret; } @@ -609,16 +598,12 @@ int ompio_io_ompio_file_read_at_all_begin (mca_io_ompio_file_t *fh, ompio_io_ompio_file_get_position (fh, &prev_offset ); ompi_io_ompio_set_explicit_offset (fh, offset); - ret = fh->f_fcoll->fcoll_file_read_all_begin (fh, - buf, - count, - datatype); - /* It is OK to reset the position already here, althgouth ** the operation might still be pending/ongoing, since ** the entire array of have ** already been constructed in the file_read_all_begin operation */ + ompi_io_ompio_set_explicit_offset (fh, prev_offset); return ret; } @@ -631,7 +616,6 @@ int mca_io_ompio_file_read_at_all_end (ompi_file_t *fh, mca_io_ompio_data_t *data; data = (mca_io_ompio_data_t *) fh->f_io_selected_data; - ret = ompio_io_ompio_file_read_at_all_end(&data->ompio_fh,buf,status); return ret; } @@ -642,9 +626,6 @@ int ompio_io_ompio_file_read_at_all_end (mca_io_ompio_file_t *ompio_fh, { int ret = OMPI_SUCCESS; - ret = ompio_fh->f_fcoll->fcoll_file_read_all_end (ompio_fh, - buf, - status); return ret; } diff --git a/ompi/mca/io/ompio/io_ompio_file_write.c b/ompi/mca/io/ompio/io_ompio_file_write.c index 06f364dea5..2bcd36685c 100644 --- a/ompi/mca/io/ompio/io_ompio_file_write.c +++ b/ompi/mca/io/ompio/io_ompio_file_write.c @@ -669,8 +669,7 @@ int mca_io_ompio_file_write_at_all_begin (ompi_file_t *fh, mca_io_ompio_data_t *data; data = (mca_io_ompio_data_t *) fh->f_io_selected_data; - ret = ompio_io_ompio_file_write_at_all_begin(&data->ompio_fh,offset,buf,count,datatype); - + ret = ompio_io_ompio_file_write_at_all_begin (&data->ompio_fh, offset, buf, count, datatype ); return ret; } @@ -685,10 +684,6 @@ int ompio_io_ompio_file_write_at_all_begin (mca_io_ompio_file_t *fh, ompio_io_ompio_file_get_position (fh, &prev_offset ); ompi_io_ompio_set_explicit_offset (fh, offset); - ret = fh->f_fcoll->fcoll_file_write_all_begin (fh, - buf, - count, - datatype); /* It is OK to reset the position already here, althgouth ** the operation might still be pending/ongoing, since @@ -718,9 +713,6 @@ int ompio_io_ompio_file_write_at_all_end (mca_io_ompio_file_t *fh, { int ret = OMPI_SUCCESS; - ret = fh->f_fcoll->fcoll_file_write_all_end (fh, - buf, - status); return ret; } @@ -734,11 +726,6 @@ int mca_io_ompio_file_write_all_begin (ompi_file_t *fh, mca_io_ompio_data_t *data; data = (mca_io_ompio_data_t *) fh->f_io_selected_data; - ret = data->ompio_fh. - f_fcoll->fcoll_file_write_all_begin (&data->ompio_fh, - buf, - count, - datatype); return ret; } @@ -751,10 +738,6 @@ int mca_io_ompio_file_write_all_end (ompi_file_t *fh, mca_io_ompio_data_t *data; data = (mca_io_ompio_data_t *) fh->f_io_selected_data; - ret = data->ompio_fh. - f_fcoll->fcoll_file_write_all_end (&data->ompio_fh, - buf, - status); return ret; }