Merge pull request #62 from daos-stack/mschaara/adio_merge_main

Mschaara/adio merge main

Author: mchaarawi

.github/CODEOWNERS

@@ -0,0 +1,4 @@
+# The Intel MPICH team is primarily responsible for the collective TSP
+# and algorithm frameworks.
+/src/mpi/coll/algorithms/ @pmodels/intel-reviewers
+/src/mpi/coll/transports/ @pmodels/intel-reviewers

.gitignore

@@ -96,7 +96,6 @@ localdefs
 mpe_*.conf
 mpich*pgrs.html
 mpid_config.h.in
-mpiexec
 old
 old*_pngs
 stamp-h1
@@ -152,8 +151,6 @@ Makefile.am-stamp
 
 # random stuff
 /maint/gcovmerge
-/src/binding/fortran/mpif_h/buildiface-stamp
-/src/binding/fortran/use_mpi/buildiface-stamp
 /src/binding/cxx/buildiface-stamp
 
 # script-generated f90 test files
@@ -190,7 +187,6 @@ Makefile.am-stamp
 /src/mpi/coll/src/csel_json_autogen.c
 
 # stamp "witness" files from the new build system
-/src/binding/fortran/use_mpi/buildiface.stamp
 /src/binding/fortran/use_mpi/mpi.mod-stamp
 /src/binding/fortran/use_mpi/mpi_base.mod-stamp
 /src/binding/fortran/use_mpi/mpi_constants.mod-stamp
@@ -223,9 +219,6 @@ Makefile.am-stamp
 /src/pm/mpd/aclocal.m4
 /src/pm/gforker/mpiexec.gforker
 /maint/Version
-/src/binding/fortran/mpif_h/Makefile.mk
-/src/binding/fortran/use_mpi/Makefile.mk
-/src/binding/fortran/use_mpi_f08/Makefile.mk
 
 # MPICH2 parameter handling
 /src/include/mpir_cvars.h
@@ -377,7 +370,6 @@ Makefile.am-stamp
 /maint/getcoverage
 /maint/createcoverage
 /maint/showsizes
-/maint/getcross
 /maint/makerpm
 /maint/clmake
 /maint/conftimestamp
@@ -412,29 +404,24 @@ Makefile.am-stamp
 /src/binding/fortran/mpif_h/setbot.c
 /src/binding/fortran/mpif_h/mpif77.conf
 /src/binding/fortran/mpif_h/mpif77
-/src/binding/fortran/mpif_h/*.c
-!/src/binding/fortran/mpif_h/attr_proxy.c
 /src/binding/fortran/mpif_h/fproto.h
 /src/binding/fortran/mpif_h/mpif.h
 /src/binding/fortran/mpif_h/mpif.h.in
-/src/binding/fortran/mpif_h/fprotos.h
+/src/binding/fortran/mpif_h/fortran_profile.h
+/src/binding/fortran/mpif_h/fortran_binding.c
 
 # /src/binding/fortran/use_mpi/
 /src/binding/fortran/use_mpi/mpi_base.f90.orig
 /src/binding/fortran/use_mpi/mpi_base.f90.new
 /src/binding/fortran/use_mpi/mpif.h
 /src/binding/fortran/use_mpi/Makefile.sm
-/src/binding/fortran/use_mpi/mpi.f90
 /src/binding/fortran/use_mpi/mpi_t1.f90
 /src/binding/fortran/use_mpi/mpimod.pcl
 /src/binding/fortran/use_mpi/mpi_sizeofs.f90
 /src/binding/fortran/use_mpi/mpi_base.f90
 /src/binding/fortran/use_mpi/mpif90model.h
 /src/binding/fortran/use_mpi/mpif90type.h
 /src/binding/fortran/use_mpi/mpi_constants.f90
-/src/binding/fortran/use_mpi/typef90intf.c
-/src/binding/fortran/use_mpi/typef90realf.c
-/src/binding/fortran/use_mpi/typef90cmplxf.c
 /src/binding/fortran/use_mpi/mpifnoext.h
 
 # generated by src/binding/fortran/use_mpi_f08/buildiface

CHANGES

@@ -1,3 +1,9 @@
+===============================================================================
+                               Changes in 4.1
+===============================================================================
+
+# Testsuite (test/mpi) is configured separately from mpich configure.
+
 ===============================================================================
                                Changes in 4.0
 ===============================================================================
@@ -18,7 +24,9 @@
 # Generate C API interface functions including man page notes and error
   checking using Python scripts.
 
-# Generate Fortran mpi_f08 binding using Python scripts.
+# Generate Fortran bindings using Python scripts.
+
+# Generate collective entrance functions and generate per-algorithm tests.
 
 # Support explicit --without-cuda configure option.
 
@@ -28,9 +36,22 @@
 
 # Multi-NIC support in ch4:ofi.
 
-   A full list of changes is available at the following link:
+# Default to ch4:ofi when configure doesn't have a clear choice. Add message
+  block at the end of configure to advise user.
+
+# Multiple VCI is fully implemented including the active message fallback paths.
+
+# Extend IPC to support non-contig datatypes.
+
+# Add AMD GPU support using HIP.
+
+# Add generic RNDV callback mechanism with active messages.
+
+# Refactor ch4 dynamic process functions.
+
+# Avoid building MPL and hwloc multiple times.
 
-     http://www.mpich.org/static/downloads/4.0a2/shortlog
+# Many bug fixes and code clean-ups.
 
 ===============================================================================
                                Changes in 3.4

Jenkinsfile

@@ -42,7 +42,7 @@
 
 // no debian/ support yet
 // no pmix for leap15 yet
-packageBuildingPipeline(['distros' : ['centos7', 'centos8', 'leap15'],
+packageBuildingPipeline(['distros' : ['centos7', 'el8', 'leap15'],
                          'publish_branch': 'daos_adio-rpm',
                          'make args' : 'CHROOT=true -f Makefile-rpm.mk',
                          'add_make_targets': 'romio-tarball',

Makefile.am

@@ -48,11 +48,11 @@ pkgconfigdir = @pkgconfigdir@
 # to build src/mpi/errhan/defmsg.h
 errnames_txt_files = 
 
-external_subdirs = @mplsrcdir@ @zmsrcdir@ @hwlocsrcdir@ @jsonsrcdir@ @yaksasrcdir@
+external_subdirs = @mplsrcdir@ @zmsrcdir@ @hwlocsrcdir@ @jsonsrcdir@ @yaksasrcdir@ @pmisrcdir@
 external_ldflags = @mpllibdir@ @zmlibdir@ @yaksalibdir@
 external_libs = @WRAPPER_LIBS@
 mpi_convenience_libs =
-pmpi_convenience_libs = @mpllib@ @zmlib@ @hwloclib@ @jsonlib@ @yaksalib@
+pmpi_convenience_libs = @mpllib@ @zmlib@ @hwloclib@ @jsonlib@ @yaksalib@ @pmilib@
 
 # NOTE on our semi-unconventional usage of DIST_SUBDIRS:
 # The automake manual recommends thinking of DIST_SUBDIRS as the list of all
@@ -191,9 +191,11 @@ EXTRA_DIST += README.vin
 testing:
 	( cd test && $(MAKE) $(AM_MAKEFLAGS) testing )
 
+testconfig:
+	( cd test && $(MAKE) $(AM_MAKEFLAGS) mpi/Makefile )
+
 test-clean:
 	( cd test && $(MAKE) $(AM_MAKEFLAGS) clean )
-CLEAN_LOCAL_TARGETS += test-clean
 
 ## FIXME: this should live in src/env/Makefile.mk. Moving it there
 ## will not cause a problem, but it will break the build if another
@@ -474,7 +476,7 @@ mandoc:
 	test -d $(mandoc_path1) || $(MKDIR_P) $(mandoc_path1)
 	test -d $(mandoc_path3) || $(MKDIR_P) $(mandoc_path3)
 	$(MAKE) $(AM_MAKEFLAGS) mandoc-local
-mandoc-local: $(mpi_sources:.c=.man-phony) $(doc1_src_txt:.txt=.man1-phony) \
+mandoc-local: $(doc1_src_txt:.txt=.man1-phony) \
 	$(doc3_src_txt:.txt=.man3-phony)
 	for subdir in $(MANDOC_SUBDIRS) - ; do \
 	    if test "x$$subdir" = "x-" ; then break ; fi ; \
@@ -492,8 +494,7 @@ mandoc-local: $(mpi_sources:.c=.man-phony) $(doc1_src_txt:.txt=.man1-phony) \
 		fi \
 	    fi \
 	done
-#      FIXME: the 'mancnst' script need to be committed for this to work
-#      (cd $(abs_top_builddir) && $(abs_top_srcdir)/doc/mansrc/mancnst)
+	$(srcdir)/maint/alias_mancnst
 
 # use htmldoc-local target to force directory creation before running DOCTEXT
 # Note that the mpi.cit is appended to by each update, so it must be removed
@@ -504,7 +505,7 @@ htmldoc:
 	rm -f $(htmldoc_path3)/mpi.cit
 	$(MAKE) $(AM_MAKEFLAGS) htmldoc-local
 
-htmldoc-local: $(mpi_sources:.c=.html-phony) $(doc1_src_txt:.txt=.html1-phony) \
+htmldoc-local: $(doc1_src_txt:.txt=.html1-phony) \
 	$(doc3_src_txt:.txt=.html3-phony)
 	for subdir in $(HTMLDOC_SUBDIRS) - ; do \
 	    if test "x$$subdir" = "x-" ; then break ; fi ; \
@@ -616,6 +617,11 @@ include $(top_srcdir)/doc/Makefile.mk
 # -local targets
 install-data-local: $(INSTALL_DATA_LOCAL_TARGETS)
 
+# the dist target created by automake won't work. Direct user to use release.pl
+dist:
+	@echo "To create release tarball, use:" ; \
+	echo "    maint/release.pl --branch=[git_ref_to_use] --version=[version] --git-repo=[path_to_git_repository]"
+
 
 # sometimes helpful when debugging macros to see the preprocessed output.
 # Also using '-CC' because comments provide useful landmarks

README.vin

@@ -44,6 +44,8 @@ shared memory), Hydra process management) of MPICH up and running.
 
     - REQUIRED: This tar file mpich-%VERSION%.tar.gz
 
+    - REQUIRED: Perl
+
     - REQUIRED: A C compiler (C99 support is required. See
       https://wiki.mpich.org/mpich/index.php/Shifting_toward_C99)
 
@@ -59,6 +61,8 @@ shared memory), Hydra process management) of MPICH up and running.
       --disable-fortran (configuring MPICH is described in step 1(d)
       below).
 
+    - OPTIONAL: Python 3. Python 3 is needed to generate Fortran bindings.
+
     Also, you need to know what shell you are using since different shell
     has different command syntax. Command "echo $SHELL" prints out the
     current shell used by your terminal program.
@@ -596,11 +600,18 @@ configuration options can be found using:
 ==================================
 
 To test MPICH, we package the MPICH test suite in the MPICH
-distribution. You can run the test suite using:
+distribution. You can run the test suite after "make install" using:
 
      make testing
 
-The results summary will be placed in test/summary.xml
+The results summary will be placed in test/summary.xml.
+
+The test suite can be used independently to test any installed MPI
+implementations:
+
+     cd test/mpi
+     ./configure --with-mpi=/path/to/mpi
+     make testing
 
 -------------------------------------------------------------------------