Skip to content

Commit

Permalink
mpi adapt Oceanstor pacific interface
Browse files Browse the repository at this point in the history
  • Loading branch information
@openmpi
public (aafe46adcc9e) authored and openmpi committed Jul 7, 2021
1 parent 8b4a8cd commit 43f3755
Show file tree
Hide file tree
Showing 45 changed files with 5,963 additions and 126 deletions.
113 changes: 0 additions & 113 deletions .mailmap
View file

This file was deleted.

19 changes: 19 additions & 0 deletions ompi/include/ompi_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,28 @@
#define OMPI_CONFIG_H

#include "opal_config.h"
#include <time.h>

#define OMPI_IDENT_STRING OPAL_IDENT_STRING

#if 0
#ifndef OMPI_LOG
#define OMPI_LOG() printf("_OMPI_LOG_ %s,%s,%d\n", __FILE__, __func__, __LINE__)
#define OMPI_LOG_INT(val) printf("_OMPI_LOG_ %s,%s,%d,"#val"=%d\n", __FILE__, __func__, __LINE__, val)
#define OMPI_LOG_LLU(val) printf("_OMPI_LOG_ %s,%s,%d,"#val":%llu\n", __FILE__, __func__, __LINE__, val)
#define OMPI_LOG_LL(val) printf("_OMPI_LOG_ %s,%s,%d,"#val":%lld\n", __FILE__, __func__, __LINE__, val)
#define OMPI_LOG_STR(str) printf("_OMPI_LOG_ %s,%s,%d,"#str":%s\n", __FILE__, __func__, __LINE__, str)
#endif
#else
#ifndef OMPI_LOG
#define OMPI_LOG()
#define OMPI_LOG_INT(val)
#define OMPI_LOG_LLU(val)
#define OMPI_LOG_LL(val)
#define OMPI_LOG_STR(str)
#endif
#endif

/***********************************************************************
*
* OMPI-specific Fortran code that should be in ompi_config.h, but not
Expand Down
4 changes: 3 additions & 1 deletion ompi/mca/io/romio321/romio/adio/Makefile.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ noinst_HEADERS += \
adio/include/nopackage.h \
adio/include/romioconf-undefs.h \
adio/include/mpiu_external32.h \
adio/include/hint_fns.h
adio/include/hint_fns.h \
adio/include/ad_env.h

include $(top_srcdir)/adio/ad_gpfs/Makefile.mk
include $(top_srcdir)/adio/ad_gpfs/bg/Makefile.mk
Expand All @@ -43,5 +44,6 @@ include $(top_srcdir)/adio/ad_testfs/Makefile.mk
include $(top_srcdir)/adio/ad_ufs/Makefile.mk
include $(top_srcdir)/adio/ad_xfs/Makefile.mk
include $(top_srcdir)/adio/ad_zoidfs/Makefile.mk
include $(top_srcdir)/adio/ad_oceanfs/Makefile.mk
include $(top_srcdir)/adio/common/Makefile.mk

39 changes: 39 additions & 0 deletions ompi/mca/io/romio321/romio/adio/ad_oceanfs/Makefile.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
## -*- Mode: Makefile; -*-
## vim: set ft=automake :
##
## (C) 2017 by DataDirect Networks
## See COPYRIGHT in top-level directory.
##

if BUILD_AD_OCEANFS

noinst_HEADERS += adio/ad_oceanfs/ad_oceanfs.h \
adio/ad_oceanfs/ad_oceanfs_common.h \
adio/ad_oceanfs/ad_oceanfs_file.h \
adio/ad_oceanfs/ad_oceanfs_pub.h \
adio/ad_oceanfs/ad_oceanfs_tuning.h \
adio/ad_oceanfs/ad_oceanfs_group_tuning.h \
adio/ad_oceanfs/ad_oceanfs_aggrs.h \
adio/ad_oceanfs/mpi_fs_intf.h
romio_other_sources += \
adio/ad_oceanfs/ad_oceanfs.c \
adio/ad_oceanfs/ad_oceanfs_close.c \
adio/ad_oceanfs/ad_oceanfs_common.c \
adio/ad_oceanfs/ad_oceanfs_fcntl.c \
adio/ad_oceanfs/ad_oceanfs_io.c \
adio/ad_oceanfs/ad_oceanfs_open.c \
adio/ad_oceanfs/ad_oceanfs_file.c \
adio/ad_oceanfs/ad_oceanfs_pub.c \
adio/ad_oceanfs/ad_oceanfs_tuning.c \
adio/ad_oceanfs/ad_oceanfs_group_tuning.c \
adio/ad_oceanfs/ad_oceanfs_aggrs.c \
adio/ad_oceanfs/ad_oceanfs_rdstr.c \
adio/ad_oceanfs/ad_oceanfs_rdcoll.c \
adio/ad_oceanfs/ad_oceanfs_wrcoll.c \
adio/ad_oceanfs/ad_oceanfs_resize.c \
adio/ad_oceanfs/ad_oceanfs_hints.c \
adio/ad_oceanfs/ad_oceanfs_view.c \
adio/ad_oceanfs/ad_oceanfs_viewio.c \
adio/ad_oceanfs/mpi_fs_intf.c

endif BUILD_AD_OCEANFS
32 changes: 32 additions & 0 deletions ompi/mca/io/romio321/romio/adio/ad_oceanfs/ad_oceanfs.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#include "ad_oceanfs.h"
#include "adioi.h"

struct ADIOI_Fns_struct ADIO_OCEANFS_operations = {
ADIOI_OCEANFS_Open, /* Open */
ADIOI_GEN_OpenColl, /* OpenColl */
ADIOI_OCEANFS_ReadContig, /* ReadContig */
ADIOI_OCEANFS_WriteContig, /* WriteContig */
ADIOI_OCEANFS_ReadStridedColl, /* ReadStridedColl */
ADIOI_OCEANFS_WriteStridedColl, /* WriteStridedColl */
ADIOI_GEN_SeekIndividual, /* SeekIndividual */
ADIOI_OCEANFS_Fcntl, /* Fcntl */
ADIOI_OCEANFS_SetInfo, /* SetInfo */
ADIOI_OCEANFS_ReadStrided, /* ReadStrided */
ADIOI_GEN_WriteStrided, /* WriteStrided */
ADIOI_OCEANFS_Close, /* Close */
ADIOI_FAKE_IreadContig, /* IreadContig */
ADIOI_FAKE_IwriteContig, /* IwriteContig */
ADIOI_FAKE_IODone, /* ReadDone */
ADIOI_FAKE_IODone, /* WriteDone */
ADIOI_FAKE_IOComplete, /* ReadComplete */
ADIOI_FAKE_IOComplete, /* WriteComplete */
ADIOI_FAKE_IreadStrided, /* IreadStrided */
ADIOI_FAKE_IwriteStrided, /* IwriteStrided */
ADIOI_GEN_Flush, /* Flush */
ADIOI_OCEANFS_Resize, /* Resize */
ADIOI_GEN_Delete, /* Delete */
ADIOI_GEN_Feature, /* Feature */
ADIOI_OCEANFS_PREFIX,
ADIOI_GEN_IreadStridedColl, /* IreadStridedColl */
ADIOI_GEN_IwriteStridedColl /* IwriteStridedColl */
};
48 changes: 48 additions & 0 deletions ompi/mca/io/romio321/romio/adio/ad_oceanfs/ad_oceanfs.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#ifndef AD_OCEANFS_H_INCLUDED
#define AD_OCEANFS_H_INCLUDED

#include "adio.h"
#include "ad_oceanfs_tuning.h"

#define OCEANFS_READ 0
#define OCEANFS_WRITE 1
#define OCEANFS_READ_STRIDED 2
#define OCEANFS_READ_COLL 3
#define OCEANFS_WRITE_STRIDED 4
#define OCEANFS_WRITE_COLL 5

#define ADIOI_OCEANFS_PREFIX "oceanfs:"
#define ADIOI_OCEANFS_PREFIX_LEN (sizeof(ADIOI_OCEANFS_PREFIX) - 1)

void ADIOI_OCEANFS_Open(ADIO_File fd, int *error_code);

void ADIOI_OCEANFS_Close(ADIO_File fd, int *error_code);

void ADIOI_OCEANFS_ReadContig(ADIO_File fd, void *buf, int count, MPI_Datatype datatype, int file_ptr_type,
ADIO_Offset offset, ADIO_Status *status, int *error_code);

void ADIOI_OCEANFS_WriteContig(ADIO_File fd, const void *buf, int count, MPI_Datatype datatype, int file_ptr_type,
ADIO_Offset offset, ADIO_Status *status, int *error_code);

void ADIOI_OCEANFS_ReadStrided(ADIO_File fd, void *buf, int count, MPI_Datatype datatype, int file_ptr_type,
ADIO_Offset offset, ADIO_Status *status, int *error_code);

void ADIOI_OCEANFS_ReadStridedColl(ADIO_File fd, void *buf, int count, MPI_Datatype datatype, int file_ptr_type,
ADIO_Offset offset, ADIO_Status *status, int *error_code);

void ADIOI_OCEANFS_WriteStridedColl(ADIO_File fd, const void *buf, int count, MPI_Datatype datatype, int file_ptr_type,
ADIO_Offset offset, ADIO_Status *status, int *error_code);

void ADIOI_OCEANFS_Fcntl(ADIO_File fd, int flag, ADIO_Fcntl_t *fcntl_struct, int *error_code);

void ADIOI_OCEANFS_Resize(ADIO_File fd, ADIO_Offset size, int *error_code);

void ADIOI_OCEANFS_SetInfo(ADIO_File fd, MPI_Info users_info, int *error_code);

int ADIOI_OCEANFS_set_view(ADIO_File fd, int *error_code);

int ADIOI_OCEANFS_StridedViewIO(ADIO_File fd, void *buf, int count, MPI_Datatype datatype, int file_ptr_type,
ADIO_Offset offset, ADIO_Status *status, int io_flag, int *error_code);
int ADIOI_OCEANFS_Set_lock(FDTYPE fd, int cmd, int type, ADIO_Offset offset, int whence, ADIO_Offset len);

#endif /* AD_OCEANFS_H_INCLUDED */
Loading

0 comments on commit 43f3755

Please sign in to comment.