ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

remove split collective interfaces from fcoll and their fake implemenations. Not required anymore

Просмотр исходного кода
Этот коммит содержится в:
Edgar Gabriel 2015-06-02 09:39:16 -05:00
родитель 19cac73a9b
Коммит 100515e321
31 изменённых файлов: 53 добавлений и 706 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
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_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la

16
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

36
ompi/mca/fcoll/dynamic/fcoll_dynamic_file_read_all_begin.c
Просмотреть файл

@ -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;
}

35
ompi/mca/fcoll/dynamic/fcoll_dynamic_file_read_all_end.c
Просмотреть файл

@ -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;
}

36
ompi/mca/fcoll/dynamic/fcoll_dynamic_file_write_all_begin.c
Просмотреть файл

@ -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;
}

35
ompi/mca/fcoll/dynamic/fcoll_dynamic_file_write_all_end.c
Просмотреть файл

@ -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;
}

5
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 */
};

32
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;

8
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_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la

16
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

36
ompi/mca/fcoll/individual/fcoll_individual_file_read_all_begin.c
Просмотреть файл

@ -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;
}

35
ompi/mca/fcoll/individual/fcoll_individual_file_read_all_end.c
Просмотреть файл

@ -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;
}

36
ompi/mca/fcoll/individual/fcoll_individual_file_write_all_begin.c
Просмотреть файл

@ -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;
}

35
ompi/mca/fcoll/individual/fcoll_individual_file_write_all_end.c
Просмотреть файл

@ -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;
}

5
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 */
};

8
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_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la

18
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

36
ompi/mca/fcoll/static/fcoll_static_file_read_all_begin.c
Просмотреть файл

@ -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;
}

35
ompi/mca/fcoll/static/fcoll_static_file_read_all_end.c
Просмотреть файл

@ -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;
}

36
ompi/mca/fcoll/static/fcoll_static_file_write_all_begin.c
Просмотреть файл

@ -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;
}

35
ompi/mca/fcoll/static/fcoll_static_file_write_all_end.c
Просмотреть файл

@ -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;
}

5
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 */
};

8
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_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la

16
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,

36
ompi/mca/fcoll/two_phase/fcoll_two_phase_file_read_all_begin.c
Просмотреть файл

@ -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;
}

35
ompi/mca/fcoll/two_phase/fcoll_two_phase_file_read_all_end.c
Просмотреть файл

@ -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;
}

36
ompi/mca/fcoll/two_phase/fcoll_two_phase_file_write_all_begin.c
Просмотреть файл

@ -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;
}

35
ompi/mca/fcoll/two_phase/fcoll_two_phase_file_write_all_end.c
Просмотреть файл

@ -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;
}

6
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 */
};

21
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 <offset, length, memaddress> 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;
}

19
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;
}