boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 13:02:11 +00:00
Code Issues Projects Releases Wiki Activity

Work around BBv2 feature propagation bug

Browse Source 
[SVN r36456]
This commit is contained in:
Douglas Gregor
2006-12-18 19:38:12 +00:00
parent a8ce1143a6
commit ad463597a6
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
v2/tools/mpi.jam
View File

@@ -36,10 +36,11 @@
# the bjam command line.
#
# The (optional) fourth argument configures Boost.MPI for running
# regression tests. These parameters specify the executable used to launch jobs
# (default: "mpirun") followed by any necessary arguments to this to run tests and
# tell the program to expect the number of processors to follow (default: "-np").
# With the default parameters, for instance, the test harness will execute, e.g.,
# regression tests. These parameters specify the executable used to
# launch jobs (default: "mpirun") followed by any necessary arguments
# to this to run tests and tell the program to expect the number of
# processors to follow (default: "-np"). With the default parameters,
# for instance, the test harness will execute, e.g.,
#
# mpirun -np 4 all_gather_test
#
@@ -48,7 +49,7 @@
# To link against the MPI libraries, import the "mpi" module and add the
# following requirement to your target:
#
# <library>/mpi//mpi
# <library>/mpi//mpi
#
# Since MPI support is not always available, you should check
# "mpi.configured" before trying to link against the MPI libraries.
@@ -182,6 +183,15 @@ rule cmdline_to_features ( cmdline : unknown-features ? )
if $(value) = "-pthread" || $(value) = "-pthreads"
{
result += "<threading>multi" ;
# DPG: This is a hack intended to work around a BBv2 bug where
# requirements propagated from libraries are not checked for
# conflicts when BBv2 determines which "common" properties to
# apply to a target. In our case, the <threading>single property
# gets propagated from the common properties to Boost.MPI
# targets, even though <threading>multi is in the usage
# requirements of <library>/mpi//mpi.
MPI_EXTRA_REQUIREMENTS += "<threading>multi" ;
}
else if [ MATCH "(.*[a-zA-Z0-9<>?-].*)" : $(value) ] {
otherflags += $(value) ;
@@ -356,11 +366,21 @@ rule init ( mpicxx ? : options * : mpirun-with-options * )
}
}
# States whether MPI has bee configured
rule configured ( )
{
return $(.configured) ;
}
# Returs the "extra" requirements needed to build MPI. These requirements are
# part of the /mpi//mpi library target, but they need to be added to anything
# that uses MPI directly to work around bugs in BBv2's propagation of
# requirements.
rule extra-requirements ( )
{
return $(MPI_EXTRA_REQUIREMENTS) ;
}
# Support for testing; borrowed from Python
type.register RUN_MPI_OUTPUT ;
type.register RUN_MPI : : TEST ;
@@ -393,7 +413,7 @@ generators.register
generators.register-standard testing.expect-success
: RUN_MPI_OUTPUT : RUN_MPI ;
#
# The number of processes to spawn when executing an MPI test.
feature mpi:processes : : free incidental ;
# The flag settings on testing.capture-output do not