1
1
Граф коммитов

63 Коммитов

Автор SHA1 Сообщение Дата
Jeff Squyres
a065b9b83b hwloc: allow frameworks to have alternate header filenames
Frameworks are usually required to have a framework/framework.h file.
However, this is sometimes problematic (see the hwloc use case/problem
description, below).

This commit allows frameworks to have an "autogen.options" file (i.e.,
project/mca/framework/autogen.options) that specifies things that
autogen needs to know about the framework.  Currently, the only option
recognized in autogen.options is "framework_header", which allows a
framework to specify that its header file is named something other
than "framework.h" (the framework header file must still be in the
project/mca/framework directory; it simply may be named something
other than framework.h).  More options may be introduced over time.

The use case that motivated this is the hwloc framework
(https://github.com/open-mpi/ompi/issues/2616).

Per MCA framework rules, the hwloc framework is required to have an
opal/mca/hwloc/hwloc.h file.  However, the hwloc library itself *also*
has an hwloc.h file.  This causes a problem when configuring Open MPI
with --with-hwloc=external (meaning: do not use the hwloc embedded
within the Open MPI source code tree -- instead, use an hwloc
installation from outside the Open MPI source code tree).
Specifically, when in the opal/mca/hwloc directory, the presence of
"-I." in DEFAULT_INCLUDES (put there by Automake) causes a confusion
between the hwloc.h in opal/mca/hwloc/hwloc.h and the system-installed
hwloc.h.  Chaos ensues (see the GitHub issue for more detail).

The solution is to rename the opal/mca/hwloc/hwloc.h to something else
(e.g., hwloc-internal.h), and extend autogen.pl to allow frameworks to
have an alternate name for their framework header file.

This commit introduces the autogen.pl mechanism to allow the alternate
header file name.  A follow-on commit will effect this change in the
hwloc framework (and update all the places in the code base to use the
new filename).

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
2017-02-28 07:45:34 -08:00
Ralph Castain
1e2019ce2a Revert "Update to sync with OMPI master and cleanup to build"
This reverts commit cb55c88a8b.
2016-11-22 15:03:20 -08:00
Ralph Castain
cb55c88a8b Update to sync with OMPI master and cleanup to build
Signed-off-by: Ralph Castain <rhc@open-mpi.org>
2016-11-22 14:24:54 -08:00
Bert Wesarg
8c9ca83210 autogen.pl: Fix debug output for the MPI contribs. 2016-09-27 09:13:14 +02:00
Gilles Gouaillardet
20bfc6b3d1 autogen: patch config/ltmain.sh in order to make NAG compiler pass the -pthread option to the linker 2016-06-06 11:54:24 +09:00
Gilles Gouaillardet
544a2f1631 configury: fix mpifort and oshmemfort wrapper data
NAG compiler use gcc (and not ld) as a linker, so in order to pass an option to the linker,
the flag is -Wl,-Wl,,<option> and not -Wl,<option>

Thanks Paul Hargrove for the report
2016-06-06 11:54:12 +09:00
Gilles Gouaillardet
ef3ee027b0 autogen: patch configure in order to correctly detect Solaris Studio 12.5 beta compilers
previously: f90: Sun Fortran 95 8.7 Linux_i386 2014/10/20
now : Studio 12.5 Fortran 95 8.8 Linux_i386 Beta 2015/11/17
note the "Sun" branding has gone

Thanks Paul Hargrove for the report and the patch
2016-05-10 16:28:33 +09:00
Jeff Squyres
9c9bad3db5 autogen: fix deprecated construct
Newer versions of Perl warn that unescaped left braces in regexps are
deprecated.
2016-03-04 08:42:45 -05:00
Gilles Gouaillardet
c61ef30980 autogen.pl: aborts if autogen.pl is invoked from an Open MPI tarball and without the --force option
Thanks Jeff for the wording and review
2015-11-20 13:00:55 +09:00
Nysal Jan K.A
12c5063d58 Patch configure to support PowerPC little endian
The earliest libtool release that supports PowerPC little endian
is 2.4.3. Patch configure to enable support for this architecture.
2015-10-23 16:40:08 +05:30
Gilles Gouaillardet
4c15560e49 patch generated configure to fix an other libtool bug.
Thanks to Eric Schnetter for reporting this issue and providing a fix.
2015-08-14 10:37:40 +09:00
Gilles Gouaillardet
67fdfdda7d configury: patch generated configure files to fix the libtool.m4 bug
the bug started with libtool 2.4.3
Fixes open-mpi/ompi#751
2015-08-07 11:47:32 +09:00
Jeff Squyres
982455aaa4 autogen.pl: ensure to patch *all* Autotools output
Per open-mpi/ompi#751, ensure to patch up all Autotools output (not
just in some cases).

Also, adjust the patching process to only write our verbose statements
and a new configure script if the content actually changed as result
of the patching.
2015-08-06 04:38:44 -07:00
Ralph Castain
869041f770 Purge whitespace from the repo 2015-06-23 20:59:57 -07:00
Jeff Squyres
914880a368 libtldl: remove libltdl from the tree
The libltdl interface has been completely replaced by the OPAL DL
framework (i.e., the opal_dl interface).

Fixes open-mpi/ompi#311
2015-03-09 08:18:14 -07:00
Ralph Castain
11faab1091 The final step of the RFC: convert the <foo>libdir and friends to fit their respective code areas, and equate them all at the top. Note that we can't entirely separate things as the opal_install_dirs framework can't handle separated locations for the various trees.
This commit was SVN r31679.
2014-05-08 02:01:35 +00:00
Ralph Castain
fdd35f301a Per RFC, next major step in cleaning up the build system naming patterns: rename files containing things used by the OPAL layer to be opal_foo.m4 instead of ompi_foo.m4. The ALPS plm is currently checking UGNI, so shift the check_ugni.m4 to orte for now.
This commit was SVN r31641.
2014-05-06 03:20:16 +00:00
Ralph Castain
4399d1157e Update the minimum required versions to match that on the web site
This commit was SVN r31530.
2014-04-25 21:10:05 +00:00
Jeff Squyres
0120852a2f Per Paul Hargrove's point: we shouldn't be doing anything for F77 any more.
This commit was SVN r30435.
2014-01-27 15:37:13 +00:00
Jeff Squyres
cbc9ee5894 Refs trac:4038
Revert r30096 and use better precious variable names.

This commit was SVN r30132.

The following SVN revision numbers were found above:
  r30096 --> open-mpi/ompi@e0f6a4ef47

The following Trac tickets were found above:
  Ticket 4038 --> https://svn.open-mpi.org/trac/ompi/ticket/4038
2014-01-07 15:58:40 +00:00
Ralph Castain
07503d8d6b Add some plumbing for ORCM support to keep the two code repos from diverging.
This commit was SVN r30115.
2014-01-03 22:35:20 +00:00
Ralph Castain
e0f6a4ef47 Per the discussion on email thread:
http://www.open-mpi.org/community/lists/devel/2013/12/13552.php

Patch configure for issues in NetBSD libtool

Thanks to Paul Hargrove for identifying the problem and providing the patch

cmr=v1.7.4:reviewer=jsquyres:subject=Patch configure for issues in NetBSD libtool

This commit was SVN r30096.
2013-12-26 18:06:17 +00:00
Nathan Hjelm
b8c14b9b15 Update autogen.pl with the minimum automake version (1.12.2).
cmr=v1.7.4:reviewer=rhc

This commit was SVN r29776.
2013-12-02 20:44:34 +00:00
Joshua Ladd
b3f88c4a1d Per the RFC schedule, this commit adds Mellanox OpenSHMEM to the trunk. It does not yet run on OSX or with CM PML for an MTL other than MXM. Mellanox is aware of these issues and is in the process of resolving them. This should be added to \ncmr=v1.7.4:subject=Move OSHMEM to 1.7.4:reviewer=rhc
This commit was SVN r29153.
2013-09-10 15:34:09 +00:00
Tom Naughton
26acf8adb1 + revert part of changeset r28456 that slighly modified behavior of
".ompi_ignore" to ignore entire framework and avoided adding "ignored"
  frameworks to the autogenerated "frameworks.h" header file.

  This change restores previous behavior. 

This commit was SVN r28466.

The following SVN revision numbers were found above:
  r28456 --> open-mpi/ompi@0a950009be
2013-05-08 18:10:36 +00:00
Tom Naughton
0a950009be Updates to autogen.pl:
+  Add ifdef guard to project's autogenerated "frameworks.h" header file,
   e.g., "opal/inlude/opal/frameworks.h" would have "OPAL_FRAMEWORKS_H".

+ Avoid adding "ignored" frameworks to the autogenerated "frameworks.h"
  header file.

+ Avoid adding non-MCA projects to the autogenerated 'mca_project_list',
  which maintains existing support for "projects" with new MCA framework 
  enhancements.  Moves this down to mca_run_global().

+ Add small loop at end to add projects with a "config/" subdir
  to the list of includes for 'autoreconf'.

This commit was SVN r28456.
2013-05-06 23:05:18 +00:00
Nathan Hjelm
9d4a26f47d Update OMPI frameworks to use the MCA framework system.
Notes:
  - This commit also eliminates the need for an available components list in use
    in several frameworks. None of the code in question was making use of the
    priority field of the priority component list item so these extra lists were
    removed.
  - Cleaned up selection code in several frameworks to sort lists using opal_list_sort.
  - Cleans up the ompi/orte-info functions. Expose the functions that construct the
    list of params so they can be used elsewhere.

patches for mtl/portals4 from brian

missed a few output variables in openib

This commit was SVN r28241.
2013-03-27 21:17:31 +00:00
Nathan Hjelm
c3b67d0187 Automatically generate a list of installed frameworks in project/include/project/frameworks.h
This commit was SVN r28238.
2013-03-27 21:10:32 +00:00
Joshua Ladd
70ad711337 Backing out the Open SHMEM project
This commit was SVN r28050.
2013-02-12 17:45:27 +00:00
Mike Dubman
ff384daab4 Added new project: oshmem.
This commit was SVN r28048.
2013-02-12 15:33:21 +00:00
Brian Barrett
f42783ae1a Move the RTE framework change into the trunk. With this change, all non-CR
runtime code goes through one of the rte, dpm, or pubsub frameworks.

This commit was SVN r27934.
2013-01-27 23:25:10 +00:00
Jeff Squyres
b29b852281 Consolidate all the opal/orte/ompi .m4 files back to the top-level
config/ directory.  We split them apart a while ago in the hopes that
it would simplify things, but it didn't really (e.g., because there
were still some ompi/opal .m4 files in the top-level config/
directory, resulting in developer confusion where any given m4 macro
was defined).

So this commit consolidates them back into the top-level directory for
simplicity.  

There's still (at least) two changes that would be nice to make:

 1. Split any generated .m4 file (e.g., autogen-generated .m4 files)
    into a separate directory somewhere so that a top-level -Iconfig/
    will only get our explicitly defined macros, not the autogen stuff
    (e.g., with libevent2019 needing to get the visibility macro, but
    NOT all the autogen-generated inclusion of component configure.m4
    files).
 1. Change configure to be of the form:
{{{
# ...a small amount of preamble/setup...
OPAL_SETUP
m4_ifdef([project_orte], [ORTE_SETUP])
m4_ifdef([project_ompi], [OMPI_SETUP])
# ...a small amount of finishing stuff...
}}}

I doubt we'll ever get anything as clean as that, but that would be
the goal to shoot for.

This commit was SVN r27704.
2012-12-19 00:00:36 +00:00
Nathan Hjelm
3e1b13b13a Re-add support for old flex (2.5.4a and earlier) while still cleaning up properly in new flex.
This commit was SVN r27657.
2012-12-07 00:12:43 +00:00
Jeff Squyres
7f1f857359 Per discussion on the OMPI teleconf this morning:
* Remove the check for a specific m4 version.  We don't require it.
   Autoconf requires a specific version of m4, but we don't.
 * Reduce flex min version to 2.5.4
 * Update a bunch of language in HACKING, including:
   * General text updates
   * OMPI doesn't require a specific m4; Autoconf does
   * Soften language about flex version
   * Reserve the right to upgrade min flex version to 2.5.35 someday

This commit was SVN r27647.
2012-11-27 18:09:35 +00:00
Nathan Hjelm
d5fc5e0751 make version check slightly more restrictive to avoid matching M4 as a version
This commit was SVN r27616.
2012-11-15 17:14:30 +00:00
Nathan Hjelm
d634634ad7 Readd flex version check and improve version checking in find_and_check. Accept software versions that do not support the --version option (BSD and Solaris M4).
This commit was SVN r27615.
2012-11-15 16:32:38 +00:00
Ralph Castain
d66026fdb4 Revert r27601 - breaks Mac builds as the pattern match doesn't correctly parse the flex --version output
This commit was SVN r27608.

The following SVN revision numbers were found above:
  r27601 --> open-mpi/ompi@c2fa252c14
2012-11-14 22:05:33 +00:00
Nathan Hjelm
3763c6eddf enforce minimum m4 version (1.4.16)
This commit was SVN r27603.
2012-11-13 21:16:15 +00:00
Nathan Hjelm
c2fa252c14 enforce minimum flex version in autogen.pl
This commit was SVN r27601.
2012-11-13 07:28:10 +00:00
Jeff Squyres
0715e41ff3 Make autogen.pl abort if one of the scripts it runs fails
This commit was SVN r27000.
2012-08-10 21:53:34 +00:00
Jeff Squyres
7390ab8a23 Many updates and bug fixes for the Fortran bindings. Sorry these
aren't separated out into individual commits; they represent a few
months of work in the Mercurial branch, and it seemed error-prone to
try to break them up into multiple SVN commits.

 * Remove 2nd overloaded interfaces for MPI_TESTALL, MPI_TESTSOME,
   MPI_WAITALL, and MPI_WAITSOME in the "mpi" module implementations
   (because we're not allowed to have them, anyway -- it causes
   complications in the profiling interface).  This forced an MPI-2.2
   errata in the MPI Forum; we applied the errata here (the array of
   statuses parameter could not have a specific dimension specified in
   the dummy argument).  Fixes trac:3166.
 * Similarly, fix type for MPI_ARGVS_NULL in Fortran
 * Add MPI_3.0 function MPI_F_SYNC_REG (Fortran interfaces only).
 * Add MPI-3.0 MPI_MESSAGE_NO_PROC in the mpi_f08 module.
 * Added mpi_f08 handle comparison operators, per MPI-3.0 addendum to
   the F08 proposal at the last Forum meeting.  
 * Added missing type(MPI_File) and type(Message) in mpi_f08 module.
 * Fix --disable-mpi-io configure switch with all Fortran interfaces
 * Re-factor the Fortran header files to be fundamentally simpler and
   easier to maintain.  Fortran constant values in the header files
   are now generated by a script named mpif-values.pl during
   autogen.pl (they were previously generated by mpif-common.pl, but
   it was quite a bit more subtle/complex).  A second commit will
   follow this one to update svn:ignore values (just to ensure we
   don't muck up the first commit with the SVN client getting confused
   by the changed ignore values and new/changed files).
 * Fix some dependencies for compile ordering in
   ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile.am. 
 * Fix bad wording in several places (.m4 file name, ompi_info output,
   etc.): we previoulsy said "F08 assumed shape" when we really meant
   "F08 assumed rank" (for Fortran gurus, those are very different
   things). 
 * Removed the GREEK/SVN version string from mpif.h.  It really had no
   purpose being there.

Still to be done:

 * Handling of 2D array of strings in MPI_COMM_SPAWN_MULTIPLE still
   isn't right yet.  Not sure how many people really care about this
   :-), but it is still broken.

This commit was SVN r26997.

The following Trac tickets were found above:
  Ticket 3166 --> https://svn.open-mpi.org/trac/ompi/ticket/3166
2012-08-10 21:19:47 +00:00
Josh Hursey
28681deffa Backout the ORCA commit. :(
There is a linking issue on Mac OSX that needs to be addressed before this is able to come back into the trunk.

This commit was SVN r26676.
2012-06-27 01:28:28 +00:00
Josh Hursey
542330e3a7 Commit of ORCA: Open MPI Runtime Collaborative Abstraction
This is a runtime interposition project that sits between the OMPI and ORTE layers in Open MPI.

The project is described on the wiki:
  https://svn.open-mpi.org/trac/ompi/wiki/Runtime_Interposition

And on this email thread:
  http://www.open-mpi.org/community/lists/devel/2012/06/11109.php

This commit was SVN r26670.
2012-06-26 21:42:16 +00:00
Jeff Squyres
253444c6d0 == Highlights ==
1. New mpifort wrapper compiler: you can utilize mpif.h, use mpi, and use mpi_f08 through this one wrapper compiler
 1. mpif77 and mpif90 still exist, but are sym links to mpifort and may be removed in a future release
 1. The mpi module has been re-implemented and is significantly "mo' bettah"
 1. The mpi_f08 module offers many, many improvements over mpif.h and the mpi module

This stuff is coming from a VERY long-lived mercurial branch (3 years!); it'll almost certainly take a few SVN commits and a bunch of testing before I get it correctly committed to the SVN trunk.

== More details ==

Craig Rasmussen and I have been working with the MPI-3 Fortran WG and Fortran J3 committees for a long, long time to make a prototype MPI-3 Fortran bindings implementation.  We think we're at a stable enough state to bring this stuff back to the trunk, with the goal of including it in OMPI v1.7.  

Special thanks go out to everyone who has been incredibly patient and helpful to us in this journey:

 * Rolf Rabenseifner/HLRS (mastermind/genius behind the entire MPI-3 Fortran effort)
 * The Fortran J3 committee
 * Tobias Burnus/gfortran
 * Tony !Goetz/Absoft
 * Terry !Donte/Oracle
 * ...and probably others whom I'm forgetting :-(

There's still opportunities for optimization in the mpi_f08 implementation, but by and large, it is as far along as it can be until Fortran compilers start implementing the new F08 dimension(..) syntax.

Note that gfortran is currently unsupported for the mpi_f08 module and the new mpi module.  gfortran users will a) fall back to the same mpi module implementation that is in OMPI v1.5.x, and b) not get the new mpi_f08 module.  The gfortran maintainers are actively working hard to add the necessary features to support both the new mpi_f08 module and the new mpi module implementations.  This will take some time.

As mentioned above, ompi/mpi/f77 and ompi/mpi/f90 no longer exist.  All the fortran bindings implementations have been collated under ompi/mpi/fortran; each implementation has its own subdirectory:

{{{
ompi/mpi/fortran/
  base/               - glue code
  mpif-h/             - what used to be ompi/mpi/f77
  use-mpi-tkr/        - what used to be ompi/mpi/f90
  use-mpi-ignore-tkr/ - new mpi module implementation
  use-mpi-f08/        - new mpi_f08 module implementation
}}}

There's also a prototype 6-function-MPI implementation under use-mpi-f08-desc that emulates the new F08 dimension(..) syntax that isn't fully available in Fortran compilers yet.  We did that to prove it to ourselves that it could be done once the compilers fully support it.  This directory/implementation will likely eventually replace the use-mpi-f08 version.

Other things that were done:

 * ompi_info grew a few new output fields to describe what level of Fortran support is included
 * Existing Fortran examples in examples/ were renamed; new mpi_f08 examples were added
 * The old Fortran MPI libraries were renamed:
   * libmpi_f77 -> libmpi_mpifh
   * libmpi_f90 -> libmpi_usempi
 * The configury for Fortran was consolidated and significantly slimmed down.  Note that the F77 env variable is now IGNORED for configure; you should only use FC. Example:
{{{
shell$ ./configure CC=icc CXX=icpc FC=ifort ...
}}}

All of this work was done in a Mercurial branch off the SVN trunk, and hosted at Bitbucket.  This branch has got to be one of OMPI's longest-running branches.  Its first commit was Tue Apr 07 23:01:46 2009 -0400 -- it's over 3 years old!  :-)  We think we've pulled in all relevant changes from the OMPI trunk (e.g., Fortran implementations of the new MPI-3 MPROBE stuff for mpif.h, use mpi, and use mpi_f08, and the recent Fujitsu Fortran patches).

I anticipate some instability when we bring this stuff into the trunk, simply because it touches a LOT of code in the MPI layer in the OMPI code base.  We'll try our best to make it as pain-free as possible, but please bear with us when it is committed.

This commit was SVN r26283.
2012-04-18 15:57:29 +00:00
Jeff Squyres
55d9c71ce0 Some minor improvements to autogen.pl:
* If autogen.pl needs to abort, remove the top-level "configure" file
   to emphasize that there was an error and you should not continue
 * Remove some transitional code that was useful when we were
   transitioning away from autogen.sh but is no longer needed

This commit was SVN r26241.
2012-04-06 13:50:56 +00:00
Jeff Squyres
3d242c6ab2 Be sure to check .ompi_unignore properly against the multi-line
string. 

This commit was SVN r24788.
2011-06-20 17:47:33 +00:00
Jeff Squyres
c1b26005d7 Create new opal/mca/common area, similar to ompi/mca/common. Move hwloc into this new opal MCA common area, and link the hwloc paffinity component against it. Also add a new hwloc maffinity component, and also link it against the opal MCA common hwloc. More development coming soon regarding this common hwloc instance (i.e., an OPAL-ized version of the hwloc API via a new framework so that we can safely use hwloc's services throughout the rest of the OPAL/ORTE/OMPI code bases.
This commit was SVN r24440.
2011-02-22 23:21:48 +00:00
Jeff Squyres
3933d23367 Treat the --no-ompi case exactly the same as if the ompi/ directory is
not there (e.g., for invoking autogen on tarballs without the ompi/
directory).  

Ditto for --no-orte / missing orte/ directory.

This commit was SVN r24420.
2011-02-21 17:44:34 +00:00
Nysal Jan
72ba038309 Add workaround for a Libtool (<2.2.8) bug concerning IBM xlf compilers
This commit was SVN r24294.
2011-01-25 09:53:34 +00:00
Matthias Jurenz
679317f632 Patch autotools output in all sub directories where autoreconf will be invoked. Fixes trac:2599.
This commit was SVN r24171.

The following Trac tickets were found above:
  Ticket 2599 --> https://svn.open-mpi.org/trac/ompi/ticket/2599
2010-12-14 19:14:35 +00:00