open-mpi · jsquyres · Jun 10, 2015 · Jun 10, 2015 · Jun 10, 2015 · Jun 11, 2015
diff --git a/.gitignore b/.gitignore
@@ -43,7 +43,6 @@
 Makefile
 Makefile.in
 static-components.h
-*\\#
 config.cache
 aclocal.m4
 autom4te.cache
@@ -148,17 +147,10 @@ ompi/include/mpif-io-constants.h
 ompi/include/mpif-constants.h
 ompi/include/mpif-io-handles.h
 ompi/include/mpif-sizeof.h
-ompi/include/mpi_portable_platform.h
 ompi/include/ompi/version.h
 ompi/include/ompi/frameworks.h
 
-ompi/mca/coll/basic/coll-basic-version.h*
-ompi/mca/coll/demo/config
-ompi/mca/coll/demo/coll_demo_config.h*
-ompi/mca/coll/demo/coll-demo-version.h*
 ompi/mca/coll/ml/coll_ml_lex.c
-ompi/mca/coll/self/coll-self-version.h*
-ompi/mca/coll/sm/coll-sm-version.h*
 
 ompi/mca/crcp/ompi_crcp.7
 
@@ -188,14 +180,11 @@ ompi/mca/rte/orte/mpirun.1
 
 ompi/mca/sharedfp/addproc/mca_sharedfp_addproc_control
 
-ompi/mpi/c/profile/p*.c
-
 ompi/mpi/fortran/configure-fortran-output.h
 ompi/mpi/fortran/mpiext/mpi-ext-module.F90
 ompi/mpi/fortran/mpiext/mpi-f08-ext-module.F90
 
 ompi/mpi/fortran/mpif-h/sizeof_f.f90
-ompi/mpi/fortran/mpif-h/profile/p*.c
 ompi/mpi/fortran/mpif-h/profile/psizeof_f.f90
 
 ompi/mpi/fortran/use-mpi-f08/constants.h
@@ -221,8 +210,6 @@ ompi/mpi/man/man3/MPI*.3
 ompi/mpi/man/man3/OpenMPI.3
 ompi/mpi/man/man3/.dir-stamp
 
-ompi/mpi/tool/profile/*.c
-
 ompi/mpiext/affinity/c/OMPI_Affinity_str.3
 ompi/mpiext/affinity/c/example
 
@@ -477,24 +464,11 @@ orte/util/hostfile/hostfile_lex.c
 orte/util/hostfile/orte_hosts.7
 
 oshmem/include/shmem.h
-oshmem/include/shmem_portable_platform.h
 oshmem/include/oshmem/frameworks.h
 oshmem/include/oshmem/version.h
 
 oshmem/mca/sshmem/base/static-components.h
 
-oshmem/shmem/c/profile/p*.c
-oshmem/shmem/c/profile/*.c
-
-oshmem/shmem/fortran/libshmem_fortran.la
-oshmem/shmem/fortran/profile/pshmem_*_f.c
-oshmem/shmem/fortran/profile/pshpdeallc_f.c
-oshmem/shmem/fortran/profile/pshpclmove_f.c
-oshmem/shmem/fortran/profile/pmy_pe_f.c
-oshmem/shmem/fortran/profile/pshpalloc_f.c
-oshmem/shmem/fortran/profile/pnum_pes_f.c
-oshmem/shmem/fortran/profile/pstart_pes_f.c
-
 oshmem/shmem/java/java/shmem.jar
 oshmem/shmem/java/java/doc
 oshmem/shmem/java/java/shmem_Constant.h

diff --git a/ompi/include/Makefile.am b/ompi/include/Makefile.am
@@ -28,7 +28,8 @@ headers = ompi_config.h
 nodist_headers =
 
 # Install these in $(includedir)
-include_HEADERS = 
+include_HEADERS = \
+	mpi_portable_platform.h
 
 # Always install these in $(pkgincludedir)
 pkginclude_HEADERS =
@@ -52,8 +53,7 @@ nodist_include_HEADERS = \
         mpi-ext.h \
         mpif.h \
         mpif-ext.h \
-        mpif-sizeof.h \
-	mpi_portable_platform.h
+        mpif-sizeof.h
 
 if OMPI_BUILD_FORTRAN_MPIFH_BINDINGS
 nodist_include_HEADERS += \
@@ -103,8 +103,4 @@ CLEANFILES = mpif-sizeof.f90
 # Remove the auto-generated files (they are generated by configure)
 # Since there is no mpi-ext.h.in, autogen does not know to cleanup this file.
 distclean-local:
-	rm -f mpi-ext.h mpif-ext.h mpi_portable_platform.h mpif-sizeof.h
-
-mpi_portable_platform.h: $(top_srcdir)/opal/include/opal/opal_portable_platform.h
-	-@rm -f mpi_portable_platform.h
-	$(OMPI_V_LN_S) $(LN_S) $(top_srcdir)/opal/include/opal/opal_portable_platform.h mpi_portable_platform.h
+	rm -f mpi-ext.h mpif-ext.h mpif-sizeof.h
diff --git a/ompi/include/mpi_portable_platform.h b/ompi/include/mpi_portable_platform.h
@@ -0,0 +1 @@
+../../opal/include/opal/opal_portable_platform.h
diff --git a/ompi/mpi/c/profile/Makefile.am b/ompi/mpi/c/profile/Makefile.am
@@ -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) 2009-2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2011      Sandia National Laboratories. All rights reserved.
 # Copyright (c) 2012      Oak Ridge National Laboratory. All rights reserved.
 # Copyright (c) 2012-2013 Inria.  All rights reserved.
@@ -46,7 +46,7 @@ endif
 
 headers = defines.h
 
-nodist_libmpi_c_pmpi_la_SOURCES = \
+libmpi_c_pmpi_la_SOURCES = \
         pabort.c \
         padd_error_class.c \
         padd_error_code.c \
@@ -371,7 +371,7 @@ nodist_libmpi_c_pmpi_la_SOURCES = \
         pwin_wait.c
 
 if OMPI_PROVIDE_MPI_FILE_INTERFACE
-nodist_libmpi_c_pmpi_la_SOURCES += \
+libmpi_c_pmpi_la_SOURCES += \
         pfile_c2f.c \
         pfile_call_errhandler.c \
         pfile_close.c \
@@ -432,26 +432,13 @@ nodist_libmpi_c_pmpi_la_SOURCES += \
         pregister_datarep.c
 endif
 
-#
-# Sym link in the sources from the real MPI directory
-#
-$(nodist_libmpi_c_pmpi_la_SOURCES):
-	$(OMPI_V_LN_S) if test ! -r $@ ; then \
-		pname=`echo $@ | cut -b '2-'` ; \
-		$(LN_S) $(top_srcdir)/ompi/mpi/c/$$pname $@ ; \
-	fi
-
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
 ompidir = $(ompiincludedir)/$(subdir)
 ompi_HEADERS = $(headers)
 endif
 
-# These files were created by targets above
-
-MAINTAINERCLEANFILES = $(nodist_libmpi_c_pmpi_la_SOURCES)
-
 # Don't want these targets in here
 
 tags-recursive:

diff --git a/ompi/mpi/c/profile/pabort.c b/ompi/mpi/c/profile/pabort.c
@@ -0,0 +1 @@
+../abort.c
diff --git a/ompi/mpi/c/profile/paccumulate.c b/ompi/mpi/c/profile/paccumulate.c
@@ -0,0 +1 @@
+../accumulate.c
diff --git a/ompi/mpi/c/profile/padd_error_class.c b/ompi/mpi/c/profile/padd_error_class.c
@@ -0,0 +1 @@
+../add_error_class.c
diff --git a/ompi/mpi/c/profile/padd_error_code.c b/ompi/mpi/c/profile/padd_error_code.c
@@ -0,0 +1 @@
+../add_error_code.c
diff --git a/ompi/mpi/c/profile/padd_error_string.c b/ompi/mpi/c/profile/padd_error_string.c
@@ -0,0 +1 @@
+../add_error_string.c
diff --git a/ompi/mpi/c/profile/paddress.c b/ompi/mpi/c/profile/paddress.c
@@ -0,0 +1 @@
+../address.c
diff --git a/ompi/mpi/c/profile/pallgather.c b/ompi/mpi/c/profile/pallgather.c
@@ -0,0 +1 @@
+../allgather.c
diff --git a/ompi/mpi/c/profile/pallgatherv.c b/ompi/mpi/c/profile/pallgatherv.c
@@ -0,0 +1 @@
+../allgatherv.c
diff --git a/ompi/mpi/c/profile/palloc_mem.c b/ompi/mpi/c/profile/palloc_mem.c
@@ -0,0 +1 @@
+../alloc_mem.c
diff --git a/ompi/mpi/c/profile/pallreduce.c b/ompi/mpi/c/profile/pallreduce.c
@@ -0,0 +1 @@
+../allreduce.c
diff --git a/ompi/mpi/c/profile/palltoall.c b/ompi/mpi/c/profile/palltoall.c
@@ -0,0 +1 @@
+../alltoall.c
diff --git a/ompi/mpi/c/profile/palltoallv.c b/ompi/mpi/c/profile/palltoallv.c
@@ -0,0 +1 @@
+../alltoallv.c
diff --git a/ompi/mpi/c/profile/palltoallw.c b/ompi/mpi/c/profile/palltoallw.c
@@ -0,0 +1 @@
+../alltoallw.c
diff --git a/ompi/mpi/c/profile/pattr_delete.c b/ompi/mpi/c/profile/pattr_delete.c
@@ -0,0 +1 @@
+../attr_delete.c
diff --git a/ompi/mpi/c/profile/pattr_get.c b/ompi/mpi/c/profile/pattr_get.c
@@ -0,0 +1 @@
+../attr_get.c
diff --git a/ompi/mpi/c/profile/pattr_put.c b/ompi/mpi/c/profile/pattr_put.c
@@ -0,0 +1 @@
+../attr_put.c
diff --git a/ompi/mpi/c/profile/pbarrier.c b/ompi/mpi/c/profile/pbarrier.c
@@ -0,0 +1 @@
+../barrier.c
diff --git a/ompi/mpi/c/profile/pbcast.c b/ompi/mpi/c/profile/pbcast.c
@@ -0,0 +1 @@
+../bcast.c
diff --git a/ompi/mpi/c/profile/pbsend.c b/ompi/mpi/c/profile/pbsend.c
@@ -0,0 +1 @@
+../bsend.c
diff --git a/ompi/mpi/c/profile/pbsend_init.c b/ompi/mpi/c/profile/pbsend_init.c
@@ -0,0 +1 @@
+../bsend_init.c
diff --git a/ompi/mpi/c/profile/pbuffer_attach.c b/ompi/mpi/c/profile/pbuffer_attach.c
@@ -0,0 +1 @@
+../buffer_attach.c
diff --git a/ompi/mpi/c/profile/pbuffer_detach.c b/ompi/mpi/c/profile/pbuffer_detach.c
@@ -0,0 +1 @@
+../buffer_detach.c
diff --git a/ompi/mpi/c/profile/pcancel.c b/ompi/mpi/c/profile/pcancel.c
@@ -0,0 +1 @@
+../cancel.c
diff --git a/ompi/mpi/c/profile/pcart_coords.c b/ompi/mpi/c/profile/pcart_coords.c
@@ -0,0 +1 @@
+../cart_coords.c
diff --git a/ompi/mpi/c/profile/pcart_create.c b/ompi/mpi/c/profile/pcart_create.c
@@ -0,0 +1 @@
+../cart_create.c
diff --git a/ompi/mpi/c/profile/pcart_get.c b/ompi/mpi/c/profile/pcart_get.c
@@ -0,0 +1 @@
+../cart_get.c
diff --git a/ompi/mpi/c/profile/pcart_map.c b/ompi/mpi/c/profile/pcart_map.c
@@ -0,0 +1 @@
+../cart_map.c
diff --git a/ompi/mpi/c/profile/pcart_rank.c b/ompi/mpi/c/profile/pcart_rank.c
@@ -0,0 +1 @@
+../cart_rank.c
diff --git a/ompi/mpi/c/profile/pcart_shift.c b/ompi/mpi/c/profile/pcart_shift.c
@@ -0,0 +1 @@
+../cart_shift.c
diff --git a/ompi/mpi/c/profile/pcart_sub.c b/ompi/mpi/c/profile/pcart_sub.c
@@ -0,0 +1 @@
+../cart_sub.c
diff --git a/ompi/mpi/c/profile/pcartdim_get.c b/ompi/mpi/c/profile/pcartdim_get.c
@@ -0,0 +1 @@
+../cartdim_get.c
diff --git a/ompi/mpi/c/profile/pclose_port.c b/ompi/mpi/c/profile/pclose_port.c
@@ -0,0 +1 @@
+../close_port.c
diff --git a/ompi/mpi/c/profile/pcomm_accept.c b/ompi/mpi/c/profile/pcomm_accept.c
@@ -0,0 +1 @@
+../comm_accept.c
diff --git a/ompi/mpi/c/profile/pcomm_c2f.c b/ompi/mpi/c/profile/pcomm_c2f.c
@@ -0,0 +1 @@
+../comm_c2f.c
diff --git a/ompi/mpi/c/profile/pcomm_call_errhandler.c b/ompi/mpi/c/profile/pcomm_call_errhandler.c
@@ -0,0 +1 @@
+../comm_call_errhandler.c
diff --git a/ompi/mpi/c/profile/pcomm_compare.c b/ompi/mpi/c/profile/pcomm_compare.c
@@ -0,0 +1 @@
+../comm_compare.c
diff --git a/ompi/mpi/c/profile/pcomm_connect.c b/ompi/mpi/c/profile/pcomm_connect.c
@@ -0,0 +1 @@
+../comm_connect.c
diff --git a/ompi/mpi/c/profile/pcomm_create.c b/ompi/mpi/c/profile/pcomm_create.c
@@ -0,0 +1 @@
+../comm_create.c
diff --git a/ompi/mpi/c/profile/pcomm_create_errhandler.c b/ompi/mpi/c/profile/pcomm_create_errhandler.c
@@ -0,0 +1 @@
+../comm_create_errhandler.c
diff --git a/ompi/mpi/c/profile/pcomm_create_group.c b/ompi/mpi/c/profile/pcomm_create_group.c
@@ -0,0 +1 @@
+../comm_create_group.c
diff --git a/ompi/mpi/c/profile/pcomm_create_keyval.c b/ompi/mpi/c/profile/pcomm_create_keyval.c
@@ -0,0 +1 @@
+../comm_create_keyval.c
diff --git a/ompi/mpi/c/profile/pcomm_delete_attr.c b/ompi/mpi/c/profile/pcomm_delete_attr.c
@@ -0,0 +1 @@
+../comm_delete_attr.c
diff --git a/ompi/mpi/c/profile/pcomm_disconnect.c b/ompi/mpi/c/profile/pcomm_disconnect.c
@@ -0,0 +1 @@
+../comm_disconnect.c
diff --git a/ompi/mpi/c/profile/pcomm_dup.c b/ompi/mpi/c/profile/pcomm_dup.c
@@ -0,0 +1 @@
+../comm_dup.c
diff --git a/ompi/mpi/c/profile/pcomm_dup_with_info.c b/ompi/mpi/c/profile/pcomm_dup_with_info.c
@@ -0,0 +1 @@
+../comm_dup_with_info.c
diff --git a/ompi/mpi/c/profile/pcomm_f2c.c b/ompi/mpi/c/profile/pcomm_f2c.c
@@ -0,0 +1 @@
+../comm_f2c.c
diff --git a/ompi/mpi/c/profile/pcomm_free.c b/ompi/mpi/c/profile/pcomm_free.c
@@ -0,0 +1 @@
+../comm_free.c
diff --git a/ompi/mpi/c/profile/pcomm_free_keyval.c b/ompi/mpi/c/profile/pcomm_free_keyval.c
@@ -0,0 +1 @@
+../comm_free_keyval.c
diff --git a/ompi/mpi/c/profile/pcomm_get_attr.c b/ompi/mpi/c/profile/pcomm_get_attr.c
@@ -0,0 +1 @@
+../comm_get_attr.c
diff --git a/ompi/mpi/c/profile/pcomm_get_errhandler.c b/ompi/mpi/c/profile/pcomm_get_errhandler.c
@@ -0,0 +1 @@
+../comm_get_errhandler.c
diff --git a/ompi/mpi/c/profile/pcomm_get_info.c b/ompi/mpi/c/profile/pcomm_get_info.c
@@ -0,0 +1 @@
+../comm_get_info.c
diff --git a/ompi/mpi/c/profile/pcomm_get_name.c b/ompi/mpi/c/profile/pcomm_get_name.c
@@ -0,0 +1 @@
+../comm_get_name.c
diff --git a/ompi/mpi/c/profile/pcomm_get_parent.c b/ompi/mpi/c/profile/pcomm_get_parent.c
@@ -0,0 +1 @@
+../comm_get_parent.c
diff --git a/ompi/mpi/c/profile/pcomm_group.c b/ompi/mpi/c/profile/pcomm_group.c
@@ -0,0 +1 @@
+../comm_group.c
diff --git a/ompi/mpi/c/profile/pcomm_idup.c b/ompi/mpi/c/profile/pcomm_idup.c
@@ -0,0 +1 @@
+../comm_idup.c
diff --git a/ompi/mpi/c/profile/pcomm_join.c b/ompi/mpi/c/profile/pcomm_join.c
@@ -0,0 +1 @@
+../comm_join.c
diff --git a/ompi/mpi/c/profile/pcomm_rank.c b/ompi/mpi/c/profile/pcomm_rank.c
@@ -0,0 +1 @@
+../comm_rank.c
diff --git a/ompi/mpi/c/profile/pcomm_remote_group.c b/ompi/mpi/c/profile/pcomm_remote_group.c
@@ -0,0 +1 @@
+../comm_remote_group.c
diff --git a/ompi/mpi/c/profile/pcomm_remote_size.c b/ompi/mpi/c/profile/pcomm_remote_size.c
@@ -0,0 +1 @@
+../comm_remote_size.c
diff --git a/ompi/mpi/c/profile/pcomm_set_attr.c b/ompi/mpi/c/profile/pcomm_set_attr.c
@@ -0,0 +1 @@
+../comm_set_attr.c
diff --git a/ompi/mpi/c/profile/pcomm_set_errhandler.c b/ompi/mpi/c/profile/pcomm_set_errhandler.c
@@ -0,0 +1 @@
+../comm_set_errhandler.c
diff --git a/ompi/mpi/c/profile/pcomm_set_info.c b/ompi/mpi/c/profile/pcomm_set_info.c
@@ -0,0 +1 @@
+../comm_set_info.c
diff --git a/ompi/mpi/c/profile/pcomm_set_name.c b/ompi/mpi/c/profile/pcomm_set_name.c
@@ -0,0 +1 @@
+../comm_set_name.c
diff --git a/ompi/mpi/c/profile/pcomm_size.c b/ompi/mpi/c/profile/pcomm_size.c
@@ -0,0 +1 @@
+../comm_size.c
diff --git a/ompi/mpi/c/profile/pcomm_spawn.c b/ompi/mpi/c/profile/pcomm_spawn.c
@@ -0,0 +1 @@
+../comm_spawn.c
diff --git a/ompi/mpi/c/profile/pcomm_spawn_multiple.c b/ompi/mpi/c/profile/pcomm_spawn_multiple.c
@@ -0,0 +1 @@
+../comm_spawn_multiple.c
diff --git a/ompi/mpi/c/profile/pcomm_split.c b/ompi/mpi/c/profile/pcomm_split.c
@@ -0,0 +1 @@
+../comm_split.c
diff --git a/ompi/mpi/c/profile/pcomm_split_type.c b/ompi/mpi/c/profile/pcomm_split_type.c
@@ -0,0 +1 @@
+../comm_split_type.c
diff --git a/ompi/mpi/c/profile/pcomm_test_inter.c b/ompi/mpi/c/profile/pcomm_test_inter.c
@@ -0,0 +1 @@
+../comm_test_inter.c
diff --git a/ompi/mpi/c/profile/pcompare_and_swap.c b/ompi/mpi/c/profile/pcompare_and_swap.c
@@ -0,0 +1 @@
+../compare_and_swap.c
diff --git a/ompi/mpi/c/profile/pdims_create.c b/ompi/mpi/c/profile/pdims_create.c
@@ -0,0 +1 @@
+../dims_create.c
diff --git a/ompi/mpi/c/profile/pdist_graph_create.c b/ompi/mpi/c/profile/pdist_graph_create.c
@@ -0,0 +1 @@
+../dist_graph_create.c
diff --git a/ompi/mpi/c/profile/pdist_graph_create_adjacent.c b/ompi/mpi/c/profile/pdist_graph_create_adjacent.c
@@ -0,0 +1 @@
+../dist_graph_create_adjacent.c
diff --git a/ompi/mpi/c/profile/pdist_graph_neighbors.c b/ompi/mpi/c/profile/pdist_graph_neighbors.c
@@ -0,0 +1 @@
+../dist_graph_neighbors.c
diff --git a/ompi/mpi/c/profile/pdist_graph_neighbors_count.c b/ompi/mpi/c/profile/pdist_graph_neighbors_count.c
@@ -0,0 +1 @@
+../dist_graph_neighbors_count.c
diff --git a/ompi/mpi/c/profile/perrhandler_c2f.c b/ompi/mpi/c/profile/perrhandler_c2f.c
@@ -0,0 +1 @@
+../errhandler_c2f.c
diff --git a/ompi/mpi/c/profile/perrhandler_create.c b/ompi/mpi/c/profile/perrhandler_create.c
@@ -0,0 +1 @@
+../errhandler_create.c
diff --git a/ompi/mpi/c/profile/perrhandler_f2c.c b/ompi/mpi/c/profile/perrhandler_f2c.c
@@ -0,0 +1 @@
+../errhandler_f2c.c
diff --git a/ompi/mpi/c/profile/perrhandler_free.c b/ompi/mpi/c/profile/perrhandler_free.c
@@ -0,0 +1 @@
+../errhandler_free.c
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../opal/include/opal/opal_portable_platform.h