[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-99-g745f700

Service Account noreply at mpich.org
Thu Jan 21 18:37:28 CST 2016


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  745f700ff444e5a933528e3de5faa6ab65cdd0f0 (commit)
      from  db5772f6af94274abc0c52e9e8e5fe7b63fb01bd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/745f700ff444e5a933528e3de5faa6ab65cdd0f0

commit 745f700ff444e5a933528e3de5faa6ab65cdd0f0
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Thu Jan 21 11:43:56 2016 -0600

    remove mpishared.h header file
    
    This file is no longer used by any components in MPICH. Closes #1667
    
    Signed-off-by: Yanfei Guo <yguo at anl.gov>

diff --git a/src/include/Makefile.mk b/src/include/Makefile.mk
index 4c2eb76..8e537cf 100644
--- a/src/include/Makefile.mk
+++ b/src/include/Makefile.mk
@@ -41,7 +41,6 @@ noinst_HEADERS +=                   \
     src/include/mpimem.h            \
     src/include/mpir_nbc.h          \
     src/include/mpir_type_defs.h    \
-    src/include/mpishared.h         \
     src/include/mpistates.h         \
     src/include/mpitimerimpl.h      \
     src/include/mpiu_utarray.h      \
diff --git a/src/include/mpi.h.in b/src/include/mpi.h.in
index ddba429..eeb656c 100644
--- a/src/include/mpi.h.in
+++ b/src/include/mpi.h.in
@@ -873,7 +873,6 @@ typedef int (MPIX_Grequest_wait_function)(int, void **, double, MPI_Status *);
 
 #define MPI_ERR_LASTCODE    0x3fffffff  /* Last valid error code for a 
 					   predefined error class */
-/* WARNING: this is also defined in mpishared.h.  Update both locations */
 #define MPICH_ERR_LAST_CLASS 74     /* It is also helpful to know the
 				       last valid class */
 
diff --git a/src/include/mpishared.h b/src/include/mpishared.h
deleted file mode 100644
index 4231d53..0000000
--- a/src/include/mpishared.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */
-/*  
- *
- *  (C) 2007 by Argonne National Laboratory.
- *      See COPYRIGHT in top-level directory.
- */
-
-/*
- * This file provides the very basic definitions for use in a component
- * that is to work with MPICH.  This defines (by inclusion) the 
- * MPI error reporting routines, memory access routines, and common types.
- * Using this include (instead of the comprehensive mpiimpl.h file) is 
- * appropriate for modules that perform more basic functions, such as
- * basic socket communications (see, for example, src/mpid/common/sock/poll)
- */
-
-#ifndef MPISHARED_H_INCLUDED
-#define MPISHARED_H_INCLUDED
-
-#ifdef MPIIMPL_H_INCLUDED
-#error 'mpishared.h should not be used if mpiimpl.h is included'
-#endif
-
-/* There are a few definitions that must be made *before* the mpichconf.h
-   file is included.  These include the definitions of the error levels and some
-   thread granularity constants */
-#include "mpichconfconst.h"
-
-/* Make sure that we have the basic definitions */
-#ifndef MPICHCONF_H_INCLUDED
-#include "mpichconf.h"
-#endif
-
-/* if we are defining this, we must define it before including mpl.h */
-#if defined(MPICH_DEBUG_MEMINIT)
-#define MPL_VG_ENABLED 1
-#endif
-#include "mpl.h"
-
-/* The most common MPI error classes */
-#ifndef MPI_SUCCESS
-#define MPI_SUCCESS 0
-#define MPI_ERR_ARG         12      /* Invalid argument */
-#define MPI_ERR_UNKNOWN     13      /* Unknown error */
-#define MPI_ERR_OTHER       15      /* Other error; use Error_string */
-#define MPI_ERR_INTERN      16      /* Internal error code    */
-#endif
-
-/* For supported thread levels */
-#ifndef MPI_THREAD_SINGLE
-#define MPI_THREAD_SINGLE 0
-#define MPI_THREAD_FUNNELED 1
-#define MPI_THREAD_SERIALIZED 2
-#define MPI_THREAD_MULTIPLE 3
-#endif
-
-/* Error reporting routines */
-#include "mpierror.h"
-#include "mpierrs.h"
-
-/* FIXME: This is extracted from mpi.h.in, where it may not be appropriate */
-#define MPICH_ERR_LAST_CLASS 74     /* It is also helpful to know the
-				       last valid class */
-
-#include "mpifunc.h"
-#if !defined(NEEDS_FUNC_ENTER_EXIT_DEFS)
-    /* If no timing choice is selected, this sets the entry/exit macros 
-       to empty */
-#   include "mpitimerimpl.h"
-#endif
-#ifdef NEEDS_FUNC_ENTER_EXIT_DEFS
-/* mpich layer definitions */
-#define MPID_MPI_FUNC_ENTER(a)			MPIR_FUNC_ENTER(a)
-#define MPID_MPI_FUNC_EXIT(a)			MPIR_FUNC_EXIT(a)
-#define MPID_MPI_PT2PT_FUNC_ENTER(a)		MPIR_FUNC_ENTER(a)
-#define MPID_MPI_PT2PT_FUNC_EXIT(a)		MPIR_FUNC_EXIT(a)
-#define MPID_MPI_PT2PT_FUNC_ENTER_FRONT(a)	MPIR_FUNC_ENTER(a)
-#define MPID_MPI_PT2PT_FUNC_EXIT_FRONT(a)	MPIR_FUNC_EXIT(a)
-#define MPID_MPI_PT2PT_FUNC_ENTER_BACK(a)	MPIR_FUNC_ENTER(a)
-#define MPID_MPI_PT2PT_FUNC_ENTER_BOTH(a)	MPIR_FUNC_ENTER(a)
-#define MPID_MPI_PT2PT_FUNC_EXIT_BACK(a)	MPIR_FUNC_EXIT(a)
-#define MPID_MPI_PT2PT_FUNC_EXIT_BOTH(a)	MPIR_FUNC_EXIT(a)
-#define MPID_MPI_COLL_FUNC_ENTER(a)		MPIR_FUNC_ENTER(a)
-#define MPID_MPI_COLL_FUNC_EXIT(a)		MPIR_FUNC_EXIT(a)
-#define MPID_MPI_RMA_FUNC_ENTER(a)		MPIR_FUNC_ENTER(a)
-#define MPID_MPI_RMA_FUNC_EXIT(a)		MPIR_FUNC_EXIT(a)
-#define MPID_MPI_INIT_FUNC_ENTER(a)		MPIR_FUNC_ENTER(a)
-#define MPID_MPI_INIT_FUNC_EXIT(a)		MPIR_FUNC_EXIT(a)
-#define MPID_MPI_FINALIZE_FUNC_ENTER(a)		MPIR_FUNC_ENTER(a)
-#define MPID_MPI_FINALIZE_FUNC_EXIT(a)		MPIR_FUNC_EXIT(a)
-
-/* device layer definitions */
-#define MPIDI_FUNC_ENTER(a)			MPIR_FUNC_ENTER(a)
-#define MPIDI_FUNC_EXIT(a)			MPIR_FUNC_EXIT(a)
-#define MPIDI_PT2PT_FUNC_ENTER(a)		MPIR_FUNC_ENTER(a)
-#define MPIDI_PT2PT_FUNC_EXIT(a)		MPIR_FUNC_EXIT(a)
-#define MPIDI_PT2PT_FUNC_ENTER_FRONT(a)		MPIR_FUNC_ENTER(a)
-#define MPIDI_PT2PT_FUNC_EXIT_FRONT(a)		MPIR_FUNC_EXIT(a)
-#define MPIDI_PT2PT_FUNC_ENTER_BACK(a)		MPIR_FUNC_ENTER(a)
-#define MPIDI_PT2PT_FUNC_ENTER_BOTH(a)		MPIR_FUNC_ENTER(a)
-#define MPIDI_PT2PT_FUNC_EXIT_BACK(a)		MPIR_FUNC_EXIT(a)
-#define MPIDI_PT2PT_FUNC_EXIT_BOTH(a)		MPIR_FUNC_EXIT(a)
-#define MPIDI_COLL_FUNC_ENTER(a)		MPIR_FUNC_ENTER(a)
-#define MPIDI_COLL_FUNC_EXIT(a)			MPIR_FUNC_EXIT(a)
-#define MPIDI_RMA_FUNC_ENTER(a)			MPIR_FUNC_ENTER(a)
-#define MPIDI_RMA_FUNC_EXIT(a)			MPIR_FUNC_EXIT(a)
-#define MPIDI_INIT_FUNC_ENTER(a)		MPIR_FUNC_ENTER(a)
-#define MPIDI_INIT_FUNC_EXIT(a)			MPIR_FUNC_EXIT(a)
-#define MPIDI_FINALIZE_FUNC_ENTER(a)		MPIR_FUNC_ENTER(a)
-#define MPIDI_FINALIZE_FUNC_EXIT(a)		MPIR_FUNC_EXIT(a)
-
-/* evaporate the timing macros since timing is not selected */
-#define MPIU_Timer_init(rank, size)
-#define MPIU_Timer_finalize()
-#endif /* NEEDS_FUNC_ENTER_EXIT_DEFS */
-
-/* Add support for the memory allocation routines */
-#define MPIU_MEM_NOSTDIO
-#include "mpimem.h"
-
-/* Add support for the debugging macros */
-#include "mpidbg.h"
-
-/* Add support for the assert and strerror routines */
-#include "mpiutil.h"
-
-/* Use this macro for each parameter to a function that is not referenced in
-   the body of the function */
-#ifdef HAVE_WINDOWS_H
-#define MPIU_UNREFERENCED_ARG(a) a
-#else
-#define MPIU_UNREFERENCED_ARG(a)
-#endif
-
-#endif
diff --git a/src/mpid/common/sock/poll/sock.c b/src/mpid/common/sock/poll/sock.c
index 9188ad2..a4f257e 100644
--- a/src/mpid/common/sock/poll/sock.c
+++ b/src/mpid/common/sock/poll/sock.c
@@ -5,8 +5,6 @@
  *      See COPYRIGHT in top-level directory.
  */
 
-#include "mpishared.h"
-
 #include "mpiimpl.h"
 #include "mpidu_sock.h"
 #ifdef HAVE_STRING_H
diff --git a/src/util/wrappers/mpiu_shm_wrappers.h b/src/util/wrappers/mpiu_shm_wrappers.h
index ea055e4..1bc2800 100644
--- a/src/util/wrappers/mpiu_shm_wrappers.h
+++ b/src/util/wrappers/mpiu_shm_wrappers.h
@@ -42,8 +42,8 @@
 #include "mpiu_os_wrappers_pre.h"
 #include "mpiu_util_wrappers.h"
 
-#if !(defined(MPISHARED_H_INCLUDED) || defined(MPIIMPL_H_INCLUDED))
-#error "this header must be included after mpiimpl.h or mpishared.h"
+#if !defined(MPIIMPL_H_INCLUDED)
+#error "this header must be included after mpiimpl.h"
 #endif
 
 /* FIXME: Reduce the conditional checks for wrapper-internal

-----------------------------------------------------------------------

Summary of changes:
 src/include/Makefile.mk               |    1 -
 src/include/mpi.h.in                  |    1 -
 src/include/mpishared.h               |  135 ---------------------------------
 src/mpid/common/sock/poll/sock.c      |    2 -
 src/util/wrappers/mpiu_shm_wrappers.h |    4 +-
 5 files changed, 2 insertions(+), 141 deletions(-)
 delete mode 100644 src/include/mpishared.h


hooks/post-receive
-- 
MPICH primary repository


More information about the commits mailing list