Skip to content

Commit 73521a1

Browse files
jsquyresjsquyres
committed
Merge pull request #5 from jsquyres/topic/build-infrastructure
Merged from master.
2 parents 2521257 + afea9f7 commit 73521a1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1044
-1464
lines changed

‎.gitignore_global

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# Automatically generated by build-gitignore.pl; edits may be lost!
21
.libs
32
.deps
43
.libs

‎AUTHORS

+114-106
Original file line numberDiff line numberDiff line change
@@ -4,112 +4,120 @@ Open MPI Authors
44
The following cumulative list contains the names and Subversion IDs of
55
all individuals who have committed code to the Open MPI repository.
66

7-
Username Name Affiliation(s)
8-
----------- --------------------------- -------------------------
9-
abbyz Abhishek Kulkarni IU
10-
adi Adrian Knoth UJ
11-
adkulkar Abhishek Kulkarni IU
12-
adrian Adrian Reber HE
13-
afriedle Andrew Friedley IU, SNL
14-
alekseys Aleksey Senin Mellanox
15-
alex Alex Margolin Mellanox
16-
amikheev Alex Mikheev Mellanox
17-
angskun Thara Angskun UTK
18-
Anya Anya Tatashina Sun
19-
apant Avneesh Pant QLogic
20-
bbenton Brad Benton IBM
21-
bosilca George Bosilca UTK
22-
bouteill Aurelien Bouteiller UTK
23-
brbarret Brian Barrett IU, LANL, SNL
24-
bricka Alex Brick NU
25-
casswell Laura Casswell LANL
26-
coti Camille Coti UTK, INRIA
27-
csbell Christian Bell QLogic
28-
cyeoh Chris Yeoh IBM
29-
damico Bill D'Amico Cisco
30-
ddd David Daniel LANL
31-
derbeyn Nadia Derby Bull
32-
dgdimick Denis Dimick LANL
33-
dgoodell Dave Goodell Cisco
34-
dkerr Donald Kerr Sun, Oracle
35-
dlacher Dan Lacher Sun
36-
dorons Doron Shoham Mellanox
37-
edgar Edgar Gabriel HLRS, UH, UTK
38-
emallove Ethan Mallove Sun, Oracle
39-
eugene Eugene Loh Sun, Oracle
40-
gef Graham Fagg UTK
41-
gingery Ginger Young LANL
42-
gleb Gleb Natapov Voltaire
43-
gshipman Galen Shipman LANL
44-
gwatson Greg Watson LANL
45-
hadi Hadi Montakhabi UH
46-
herault Thomas Herault INRIA
47-
hjelmn Nathan Hjelm LANL
48-
hpcstork Sven Stork HLRS
49-
htor Torsten Hoefler IU, TUC
50-
igb Iain Bason Sun, Oracle
51-
igoru Igor Usarov Mellanox
52-
jdmason Jon Mason Chelsio
53-
jjhursey Josh Hursey IU, ORNL, LANL, LBNL, UWL
54-
jladd Joshua Ladd Mellanox
55-
jnysal Nysal Jan IBM
56-
jroman Jose E. Roman UPV
57-
jsquyres Jeff Squyres Cisco, IU
58-
jurenz Matthias Jurenz ZIH
59-
karenn Karen Norteman Sun
60-
kliteyn Yevgeny Kliteynik Mellanox
61-
kmroz Karl Mroz UBC
62-
knuepfer Andreas Knuepfer ZIH
63-
koenig Greg Koenig ORNL
64-
lemarini Pierre Lemarinier UTK
65-
lennyve Lenny Verkhovsky Mellanox
66-
lums Andrew Lumsdaine IU
67-
manjugv Manjunath Gorentla Venkata ORNL
68-
matney Ken Matney ORNL
69-
miked Mike Dubman Mellanox
70-
alinas Alina Sklarevich Mellanox
71-
devendar Devendar Bureddy Mellanox
72-
mitch Mitch Sukalski SNL
73-
mschaara Mohamad Chaarawi UH
74-
mt Mark Taylor LANL
75-
naughtont Tom Naughton ORNL
76-
ollie Li-Ta Lo LANL
77-
osvegis Oscar Vega-Gisbert UPV
78-
paklui Pak Lui Sun
79-
pasha Pavel Shamis Mellanox, ORNL
80-
patrick Patrick Geoffray Myricom
81-
penoff Brad Penoff UBC
82-
pjesa Jelena Pjesivac-Grbovic UTK
83-
pkambadu Prabhanjan Kambadur IU
84-
rasmussn Craig Rasmussen LANL, UO
85-
rbbrigh Ron Brightwell SNL
86-
rfaucett Reese Faucette Cisco
87-
rhc Ralph Castain LANL, Cisco, Intel
88-
rlgraham Rich Graham ORNL, LANL, Mellanox
89-
rolfv Rolf Vandevaart Sun, Oracle, NVIDIA
90-
rta Rob Awles LANL
91-
rusraink Rainer Keller HLRS, ORNL
92-
sami Sami Ayyorgun LANL
93-
samuel Samuel K. Gutierrez LANL
94-
santhana Gopal Santhanaraman OSU
95-
sboehm Swen Boehm ORNL
96-
sharonm Sharon Melamed Voltaire
97-
shiqing Shiqing Fan HLRS
98-
sjeaugey Sylvain Jeaugey Bull
99-
surs Sayantan Sur OSU
100-
sushant Sushant Sharma LANL
101-
swise Steve Wise Chelsio
102-
tdd Terry Dontje Sun, Oracle
103-
timattox Tim Mattox IU, Cisco
104-
tprins Tim Prins IU, LANL
105-
twoodall Tim Woodall LANL
106-
vasily Vasily Filipov Mellanox
107-
vsahay Vishal Sahay IU
108-
vvenkatesan Vishwanath Venkatesan UH
109-
wbland Wesley Bland UTK
110-
yaeld Yael Dalen Mellanox
111-
yosefe Yossi Etigin Mellanox
112-
yuw Weikuan Yu LANL, OSU
7+
Email Name Affiliation(s)
8+
------------------------------- --------------------------- -------------------
9+
Nadia.Derbey@bull.net Nadia Derby Bull
10+
adi@minet.uni-jena.de Adrian Knoth UJ
11+
adkulkar@cs.indiana.edu Abhishek Kulkarni IU
12+
adrian@lisas.de Adrian Reber HE
13+
afriedle@osl.iu.edu Andrew Friedley IU, SNL
14+
alekseys@mellanox.com Aleksey Senin Mellanox
15+
alex.margolin@mail.huji.ac.il Alex Margolin Mellanox
16+
alexm@mellanox.com Alex Mikheev Mellanox
17+
alinas@mellanox.com Alina Sklarevich Mellanox
18+
andreas.knuepfer@tu-dresden.de Andreas Knuepfer ZIH
19+
angskun@cs.utk.edu Thara Angskun UTK
20+
anya.tatashina@sun.com Anya Tatashina Sun
21+
artpol84@gmail.com Artem Polyakov Individual
22+
avneesh.pant@qlogic.com Avneesh Pant QLogic
23+
bdamico@cisco.com Bill D'Amico Cisco
24+
bert.wesarg@tu-dresden.de Bert Wesarg ZIH
25+
bosilca@icl.utk.edu George Bosilca UTK
26+
bouteill@icl.utk.edu Aurelien Bouteiller UTK
27+
brad.benton@us.ibm.com Brad Benton IBM, AMD
28+
brbarret@open-mpi.org Brian Barrett IU, LANL, SNL
29+
ccoti@icl.utk.edu Camille Coti UTK, INRIA
30+
christian.bell@qlogic.com Christian Bell QLogic
31+
cyeoh@au1.ibm.com Chris Yeoh IBM
32+
dan.lacher@sun.com Dan Lacher Sun
33+
ddd@lanl.gov David Daniel LANL
34+
devendar@mellanox.com Devendar Bureddy Mellanox
35+
dgdimick@lnal.gov Denis Dimick LANL
36+
dgoodell@cisco.com Dave Goodell Cisco
37+
donald.kerr@oracle.com Donald Kerr Sun, Oracle
38+
dorons@mellanox.com Doron Shoham Mellanox
39+
ethan.mallove@oracle.com Ethan Mallove Sun, Oracle
40+
eugene.loh@oracle.com Eugene Loh Sun, Oracle
41+
gabriel@cs.uh.edu Edgar Gabriel HLRS, UH, UTK
42+
gef@icl.utk.edu Graham Fagg UTK
43+
gilles.gouaillardet@iferc.org Gilles Gouaillardet RIST
44+
gingery@lanl.gov Ginger Young LANL
45+
gleb@voltaire.com Gleb Natapov Voltaire
46+
gshipman@lanl.gov Galen Shipman LANL
47+
gwatson@lanl.gov Greg Watson LANL
48+
herault@icl.utk.edu Thomas Herault INRIA
49+
hjelmn@lanl.gov Nathan Hjelm LANL
50+
hmontakhabi@uh.edu Hadi Montakhabi UH
51+
howardp@lanl.gov Howard Pritchard LANL
52+
hppritcha@gmail.com Howard Pritchard LANL
53+
htor@osl.iu.edu Torsten Hoefler IU, TUC
54+
iain.bason@oracle.com Iain Bason Sun, Oracle
55+
igoru@mellanox.com Igor Usarov Mellanox
56+
jdmason@opengridcomputing.com Jon Mason Chelsio
57+
jjhursey@open-mpi.org Josh Hursey IU, ORNL, LANL, LBNL, UWL
58+
jnysal@in.ibm.com Nysal Jan IBM
59+
joshual@mellanox.com Joshua Ladd Mellanox
60+
jroman@dsic.upv.es Jose E. Roman UPV
61+
jsquyres@cisco.com Jeff Squyres Cisco, IU
62+
karen.norteman@sun.com Karen Norteman Sun
63+
kliteyn@mellanox.co.il Yevgeny Kliteynik Mellanox
64+
koenig@acm.org Greg Koenig ORNL
65+
lcasswell@lanl.gov Laura Casswell LANL
66+
lemarini@icl.utk.edu Pierre Lemarinier UTK
67+
lennyb@voltaire.com Lenny Verkhovsky Mellanox
68+
lums@cs.indiana.edu Andrew Lumsdaine IU
69+
manjugv@ornl.gov Manjunath Gorentla Venkata ORNL
70+
matneykdsr@ornl.gov Ken Matney ORNL
71+
matthias.jurenz@tu-dresden.de Matthias Jurenz ZIH
72+
miked@mellanox.com Mike Dubman Mellanox
73+
mjbhaskar@uh.edu Mangala Jyothi Bhaskar UH
74+
mroz.karol@gmail.com Karl Mroz UBC
75+
mschaara@cs.uh.edu Mohamad Chaarawi UH
76+
mt@lanl.gov Mark Taylor LANL
77+
mwsukal@ca.sandia.gov Mitch Sukalski SNL
78+
naughtont@ornl.gov Tom Naughton ORNL
79+
niethammer@hlrs.de Christoph Niethammer HLRS
80+
ollie@lanl.gov Li-Ta Lo LANL
81+
ovega@dsic.upv.es Oscar Vega-Gisbert UPV
82+
pak.lui@sun.com Pak Lui Sun
83+
patrick@myri.com Patrick Geoffray Myricom
84+
penoff@cs.ubc.ca Brad Penoff UBC
85+
pjesa@icl.iu.edu Jelena Pjesivac-Grbovic UTK
86+
pkambadu@osl.iu.edu Prabhanjan Kambadur IU
87+
rainer.keller@hlrs.de Rainer Keller HLRS, ORNL
88+
rasmus@cas.uoregon.edu Craig Rasmussen LANL, UO
89+
rbbrigh@sandia.gov Ron Brightwell SNL
90+
regrant@sandia.gov Ryan Grant SNL
91+
rfaucett@cisco.com Reese Faucette Cisco
92+
rhc@open-mpi.org Ralph Castain LANL, Cisco, Intel
93+
richardg@mellanox.com Rich Graham ORNL, LANL, Mellanox
94+
rta@lanl.gov Rob Awles LANL
95+
rvandevaart@nvidia.com Rolf Vandevaart Sun, Oracle, NVIDIA
96+
sami@lanl.gov Sami Ayyorgun LANL
97+
samuel@lanl.gov Samuel K. Gutierrez LANL
98+
santhana@osu.edu Gopal Santhanaraman OSU
99+
sboehm@ornl.gov Swen Boehm ORNL
100+
shamisp@ornl.gov Pavel Shamis Mellanox, ORNL
101+
sharonm@voltaire.com Sharon Melamed Voltaire
102+
shiqing@hlrs.de Shiqing Fan HLRS
103+
stork@hlrs.de Sven Stork HLRS
104+
surs@osu.edu Sayantan Sur OSU
105+
sushant@lanl.gov Sushant Sharma LANL
106+
swise@opengridcomputing.com Steve Wise Chelsio
107+
sylvain.jeaugey@bull.net Sylvain Jeaugey Bull
108+
terry.dontje@oracle.com Terry Dontje Sun, Oracle
109+
thkorde@sandia.gov Todd Kordenbrock SNL
110+
tmattox@gmail.com Tim Mattox IU, Cisco
111+
tprins@lanl.gov Tim Prins IU, LANL
112+
twoodall@lanl.gov Tim Woodall LANL
113+
vasily@mellanox.com Vasily Filipov Mellanox
114+
vsahay@osl.iu.edu Vishal Sahay IU
115+
vvenkates@gmail.com Vishwanath Venkatesan UH, Intel
116+
wbland@icl.utk.edu Wesley Bland UTK
117+
yaeld@mellanox.com Yael Dalen Mellanox
118+
yosefe@mellanox.com Yossi Etigin Mellanox
119+
yuw@lanl.gov Weikuan Yu LANL, OSU
120+
------------------------------- --------------------------- -------------------
113121

114122
Affiliation abbreviations:
115123
--------------------------

‎HACKING

+8-11
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
44
Copyright (c) 2004-2005 The University of Tennessee and The University
55
of Tennessee Research Foundation. All rights
66
reserved.
7-
Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
7+
Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
88
University of Stuttgart. All rights reserved.
99
Copyright (c) 2004-2005 The Regents of the University of California.
1010
All rights reserved.
@@ -21,21 +21,18 @@ Overview
2121

2222
This file is here for those who are building/exploring OMPI in its
2323
source code form, most likely through a developer's tree (i.e., a
24-
Subversion or Mercurial checkout).
24+
Git clone).
2525

2626

2727
Debugging vs. Optimized Builds
2828
==============================
2929

30-
If you are building Open MPI from a Subversion checkout, the default
31-
build includes a lot of debugging features. This happens
32-
automatically when when configure detects the hidden ".svn" Subversion
33-
meta directory (that is present in all Subversion checkouts) in your
34-
source tree, and therefore activates a number of developer-only
35-
debugging features in the Open MPI code base.
36-
37-
The same debugging features are activated if you build in a Mercurial
38-
clone (with the hidden ".hg" meta directory).
30+
If you are building Open MPI from a Git clone, the default build
31+
includes a lot of debugging features. This happens automatically when
32+
when configure detects the hidden ".git" Git meta directory (that is
33+
present in all Git clones) in your source tree, and therefore
34+
activates a number of developer-only debugging features in the Open
35+
MPI code base.
3936

4037
By definition, debugging builds will perform [much] slower than
4138
optimized builds of Open MPI. You should *NOT* conduct timing tests

‎INSTALL

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
88
University of Stuttgart. All rights reserved.
99
Copyright (c) 2004-2005 The Regents of the University of California.
1010
All rights reserved.
11-
Copyright (c) 2008-2010 Cisco Systems, Inc. All rights reserved.
11+
Copyright (c) 2008-2014 Cisco Systems, Inc. All rights reserved.
1212
$COPYRIGHT$
1313

1414
Additional copyrights may follow
@@ -30,8 +30,8 @@ Developer Builds
3030
================
3131

3232
If you have checked out a DEVELOPER'S COPY of Open MPI (i.e., you
33-
checked out from subversion), you should read the HACKING file before
34-
attempting to build Open MPI. You must then run:
33+
cloned from Git), you should read the HACKING file before attempting
34+
to build Open MPI. You must then run:
3535

3636
shell$ ./autogen.pl
3737

‎Makefile.am

+4-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
# University of Stuttgart. All rights reserved.
1010
# Copyright (c) 2004-2005 The Regents of the University of California.
1111
# All rights reserved.
12-
# Copyright (c) 2006-2010 Cisco Systems, Inc. All rights reserved.
13-
# Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved.
12+
# Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved.
13+
# Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved.
14+
# Copyright (c) 2014 Intel, Inc. All rights reserved.
1415
# $COPYRIGHT$
1516
#
1617
# Additional copyrights may follow
@@ -25,6 +26,6 @@ EXTRA_DIST = README INSTALL VERSION Doxyfile LICENSE autogen.pl autogen.sh \
2526
include examples/Makefile.include
2627

2728
dist-hook:
28-
env LS_COLORS= csh "$(top_srcdir)/config/distscript.csh" "$(top_srcdir)" "$(distdir)" "$(OMPI_VERSION)" "$(OMPI_SVN_R)"
29+
env LS_COLORS= csh "$(top_srcdir)/config/distscript.csh" "$(top_srcdir)" "$(distdir)" "$(OMPI_VERSION)" "$(OMPI_REPO_REV)"
2930

3031
ACLOCAL_AMFLAGS = -I config

‎README

+36-20
Original file line numberDiff line numberDiff line change
@@ -1445,8 +1445,9 @@ binary interface (ABI) compatibility implications.
14451445
Software Version Number
14461446
-----------------------
14471447

1448-
Open MPI's version numbers are the union of several different values:
1449-
major, minor, release, and an optional quantifier.
1448+
The version number of Open MPI distribution tarballs are the union of
1449+
several different values: major, minor, release, and an optional
1450+
quantifier.
14501451

14511452
* Major: The major number is the first integer in the version string
14521453
(e.g., v1.2.3). Changes in the major number typically indicate a
@@ -1492,24 +1493,39 @@ major, minor, release, and an optional quantifier.
14921493
o rcX: Indicates a release candidate. X is an integer
14931494
indicating the number of the release candidate (e.g., v1.2.3rc4
14941495
indicates the 4th release candidate of version 1.2.3).
1495-
o rV or hgV: Indicates the Subversion / Mercurial repository
1496-
number string that the release was made from (V is usually an
1497-
integer for Subversion releases and usually a string for
1498-
Mercurial releases). Although all official Open MPI releases are
1499-
tied to a single, specific Subversion or Mercurial repository
1500-
number (which can be obtained from the ompi_info command), only
1501-
some releases have the Subversion / Mercurial repository number
1502-
in the version number. Development snapshot tarballs, for
1503-
example, have the Subversion repository included in the version
1504-
to reflect that they are a development snapshot of an upcoming
1505-
release (e.g., v1.2.3r1234 indicates a development snapshot of
1506-
version 1.2.3 corresponding to Subversion repository number
1507-
1234).
1508-
1509-
Quantifiers may be mixed together -- for example v1.2.3rc7r2345
1510-
indicates a development snapshot of an upcoming 7th release
1511-
candidate for version 1.2.3 corresponding to Subversion repository
1512-
number 2345.
1496+
o Prior to October 2014, nightly snapshot tarballs would include a
1497+
repository version number as well, such as r1234, indicating
1498+
that that snapshot tarball was built at Subversion r1234).
1499+
1500+
Starting in October 2014, although the major, minor, and release
1501+
values (and optional quantifiers) are reported in Open MPI nightly
1502+
snapshot tarballs, the filenames of these snapshot tarballs follow a
1503+
slightly different convention.
1504+
1505+
Specifically, the snapshot tarball filename contains three distinct
1506+
values:
1507+
1508+
* Most recent Git tag name on the branch from which the tarball was
1509+
created.
1510+
1511+
* An integer indicating how many Git commits have occurred since
1512+
that Git tag.
1513+
1514+
* The Git hash of the tip of the branch.
1515+
1516+
For example, a snapshot tarball filename of
1517+
"openmpi-v1.8.2-57-gb9f1fd9.tar.bz2" indicates that this tarball was
1518+
created from the v1.8 branch, 57 Git commits after the "v1.8.2" tag,
1519+
specifically at Git hash gb9f1fd9.
1520+
1521+
Open MPI's Git master branch contains a single "dev" tag. For
1522+
example, "openmpi-dev-8-gf21c349.tar.bz2" represents a snapshot
1523+
tarball created from the master branch, 8 Git commits after the "dev"
1524+
tag, specifically at Git hash gf21c349.
1525+
1526+
The exact value of the "number of Git commits past a tag" integer is
1527+
fairly meaningless; its sole purpose is to provide an easy,
1528+
human-recognizable ordering for snapshot tarballs.
15131529

15141530
Shared Library Version Number
15151531
-----------------------------

0 commit comments

Comments
 (0)