Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions build/Jamfile.v2
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
# (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)

import mpi ;

constant boost_dependencies_private :
/boost/regex//boost_regex
;
Expand Down
14 changes: 0 additions & 14 deletions include/boost/graph/breadth_first_search.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,8 @@
#include <boost/graph/overloading.hpp>
#include <boost/graph/graph_concepts.hpp>
#include <boost/graph/two_bit_color_map.hpp>
#include <boost/graph/detail/mpi_include.hpp>
#include <boost/concept/assert.hpp>

#include BOOST_GRAPH_MPI_INCLUDE(<boost/graph/distributed/concepts.hpp>)

namespace boost
{

Expand Down Expand Up @@ -255,15 +252,6 @@ namespace detail
vis, color);
}

#ifdef BOOST_GRAPH_USE_MPI
template < class DistributedGraph, class ColorMap, class BFSVisitor,
class P, class T, class R >
void bfs_helper(DistributedGraph& g,
typename graph_traits< DistributedGraph >::vertex_descriptor s,
ColorMap color, BFSVisitor vis,
const bgl_named_params< P, T, R >& params, boost::mpl::true_);
#endif // BOOST_GRAPH_USE_MPI

//-------------------------------------------------------------------------
// Choose between default color and color parameters. Using
// function dispatching so that we don't require vertex index if
Expand Down Expand Up @@ -393,6 +381,4 @@ namespace graph

} // namespace boost

#include BOOST_GRAPH_MPI_INCLUDE(<boost/graph/distributed/breadth_first_search.hpp>)

#endif // BOOST_GRAPH_BREADTH_FIRST_SEARCH_HPP
3 changes: 0 additions & 3 deletions include/boost/graph/connected_components.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include <boost/graph/properties.hpp>
#include <boost/graph/graph_concepts.hpp>
#include <boost/graph/overloading.hpp>
#include <boost/graph/detail/mpi_include.hpp>
#include <boost/static_assert.hpp>
#include <boost/concept/assert.hpp>

Expand Down Expand Up @@ -109,6 +108,4 @@ connected_components(const Graph& g,

} // namespace boost

#include BOOST_GRAPH_MPI_INCLUDE(<boost/graph/distributed/connected_components.hpp>)

#endif // BOOST_GRAPH_CONNECTED_COMPONENTS_HPP
3 changes: 0 additions & 3 deletions include/boost/graph/depth_first_search.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include <boost/graph/properties.hpp>
#include <boost/graph/visitors.hpp>
#include <boost/graph/named_function_params.hpp>
#include <boost/graph/detail/mpi_include.hpp>
#include <boost/ref.hpp>
#include <boost/optional.hpp>
#include <boost/parameter.hpp>
Expand Down Expand Up @@ -421,6 +420,4 @@ void depth_first_visit(const IncidenceGraph& g,
}
} // namespace boost

#include BOOST_GRAPH_MPI_INCLUDE(<boost/graph/distributed/depth_first_search.hpp>)

#endif
10 changes: 0 additions & 10 deletions include/boost/graph/detail/empty_header.hpp

This file was deleted.

16 changes: 0 additions & 16 deletions include/boost/graph/detail/mpi_include.hpp

This file was deleted.

3 changes: 0 additions & 3 deletions include/boost/graph/dijkstra_shortest_paths.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include <memory>
#include <boost/graph/detail/d_ary_heap.hpp>
#include <boost/graph/two_bit_color_map.hpp>
#include <boost/graph/detail/mpi_include.hpp>
#include <boost/property_map/property_map.hpp>
#include <boost/property_map/vector_property_map.hpp>
#include <boost/type_traits.hpp>
Expand Down Expand Up @@ -575,6 +574,4 @@ inline void dijkstra_shortest_paths(const VertexListGraph& g,

} // namespace boost

#include BOOST_GRAPH_MPI_INCLUDE(<boost/graph/distributed/dijkstra_shortest_paths.hpp>)

#endif // BOOST_GRAPH_DIJKSTRA_HPP
3 changes: 0 additions & 3 deletions include/boost/graph/fruchterman_reingold.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <boost/graph/named_function_params.hpp>
#include <boost/graph/iteration_macros.hpp>
#include <boost/graph/topology.hpp> // For topology concepts
#include <boost/graph/detail/mpi_include.hpp>
#include <vector>
#include <list>
#include <algorithm> // for std::min and std::max
Expand Down Expand Up @@ -455,6 +454,4 @@ void fruchterman_reingold_force_directed_layout(

} // end namespace boost

#include BOOST_GRAPH_MPI_INCLUDE(<boost/graph/distributed/fruchterman_reingold.hpp>)

#endif // BOOST_GRAPH_FRUCHTERMAN_REINGOLD_FORCE_DIRECTED_LAYOUT_HPP
3 changes: 0 additions & 3 deletions include/boost/graph/graphviz.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include <boost/graph/dll_import_export.hpp>
#include <boost/graph/compressed_sparse_row_graph.hpp>
#include <boost/graph/iteration_macros.hpp>
#include <boost/graph/detail/mpi_include.hpp>
#include <boost/config/pragma_message.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/static_assert.hpp>
Expand Down Expand Up @@ -965,6 +964,4 @@ bool read_graphviz(std::istream& in, MutableGraph& graph,

} // namespace boost

#include BOOST_GRAPH_MPI_INCLUDE(<boost/graph/distributed/graphviz.hpp>)

#endif // BOOST_GRAPHVIZ_HPP
3 changes: 0 additions & 3 deletions include/boost/graph/one_bit_color_map.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

#include <boost/property_map/property_map.hpp>
#include <boost/graph/properties.hpp>
#include <boost/graph/detail/mpi_include.hpp>
#include <memory>
#include <boost/config.hpp>
#include <boost/assert.hpp>
Expand Down Expand Up @@ -101,6 +100,4 @@ inline one_bit_color_map< IndexMap > make_one_bit_color_map(

} // end namespace boost

#include BOOST_GRAPH_MPI_INCLUDE(<boost/graph/distributed/one_bit_color_map.hpp>)

#endif // BOOST_ONE_BIT_COLOR_MAP_HPP
3 changes: 0 additions & 3 deletions include/boost/graph/page_rank.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include <boost/graph/properties.hpp>
#include <boost/graph/iteration_macros.hpp>
#include <boost/graph/overloading.hpp>
#include <boost/graph/detail/mpi_include.hpp>
#include <vector>

namespace boost
Expand Down Expand Up @@ -174,6 +173,4 @@ namespace graph
}
} // end namespace boost::graph

#include BOOST_GRAPH_MPI_INCLUDE(<boost/graph/distributed/page_rank.hpp>)

#endif // BOOST_GRAPH_PAGE_RANK_HPP
3 changes: 0 additions & 3 deletions include/boost/graph/rmat_graph_generator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include <boost/random/uniform_int.hpp>
#include <boost/random/uniform_01.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/detail/mpi_include.hpp>
#include <boost/type_traits/is_base_and_derived.hpp>
#include <boost/type_traits/is_same.hpp>
// #include <boost/test/floating_point_comparison.hpp>
Expand Down Expand Up @@ -658,6 +657,4 @@ class sorted_unique_rmat_iterator

} // end namespace boost

#include BOOST_GRAPH_MPI_INCLUDE(<boost/graph/distributed/rmat_graph_generator.hpp>)

#endif // BOOST_GRAPH_RMAT_GENERATOR_HPP
3 changes: 0 additions & 3 deletions include/boost/graph/strong_components.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <boost/type_traits/conversion_traits.hpp>
#include <boost/static_assert.hpp>
#include <boost/graph/overloading.hpp>
#include <boost/graph/detail/mpi_include.hpp>
#include <boost/concept/assert.hpp>

namespace boost
Expand Down Expand Up @@ -342,6 +341,4 @@ kosaraju_strong_components(

} // namespace boost

#include BOOST_GRAPH_MPI_INCLUDE(<boost/graph/distributed/strong_components.hpp>)

#endif // BOOST_GRAPH_STRONG_COMPONENTS_HPP
3 changes: 0 additions & 3 deletions include/boost/graph/two_bit_color_map.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

#include <boost/property_map/property_map.hpp>
#include <boost/graph/properties.hpp>
#include <boost/graph/detail/mpi_include.hpp>
#include <memory>
#include <boost/config.hpp>
#include <boost/assert.hpp>
Expand Down Expand Up @@ -105,6 +104,4 @@ inline two_bit_color_map< IndexMap > make_two_bit_color_map(

} // end namespace boost

#include BOOST_GRAPH_MPI_INCLUDE(<boost/graph/distributed/two_bit_color_map.hpp>)

#endif // BOOST_TWO_BIT_COLOR_MAP_HPP
15 changes: 0 additions & 15 deletions include/boost/graph/use_mpi.hpp

This file was deleted.

76 changes: 0 additions & 76 deletions include/boost/pending/property_serialize.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,6 @@
#include <boost/pending/property.hpp>
#include <boost/core/nvp.hpp>

// Only the Parallel BGL (MPI) specializations below need Boost.Serialization,
// so keep its header out of the default build.
#ifdef BOOST_GRAPH_USE_MPI
#define BOOST_GRAPH_BLOCK_BOOSTDEP_HEADER <boost/serialization/is_bitwise_serializable.hpp>
#include BOOST_GRAPH_BLOCK_BOOSTDEP_HEADER
#undef BOOST_GRAPH_BLOCK_BOOSTDEP_HEADER
#endif

namespace boost
{
template < class Archive >
Expand All @@ -32,74 +24,6 @@ void serialize(
ar& boost::make_nvp("property_base", prop.m_base);
}

#ifdef BOOST_GRAPH_USE_MPI

// Setting the serialization properties of boost::property<> and
// boost::no_property to is_bitwise_serializable, object_serializable,
// track_never only when BOOST_GRAPH_USE_MPI is defined is dubious.
//
// This changes the serialization format of these classes, and hence
// of boost::adjacency_list, depending on whether BOOST_GRAPH_USE_MPI
// is defined.
//
// These serialization properties should probably be set in either case.
//
// Unfortunately, doing that now will change the serialization format
// of boost::adjacency_list in the non-MPI case, and could potentially
// break software that reads files serialized with an older release.

namespace mpi
{

// forward declaration, to avoid including mpi
template < typename T > struct is_mpi_datatype;

template < typename Tag, typename T, typename Base >
struct is_mpi_datatype< property< Tag, T, Base > >
: mpl::and_< is_mpi_datatype< T >, is_mpi_datatype< Base > >
{
};
}

namespace serialization
{
template < typename Tag, typename T, typename Base >
struct is_bitwise_serializable< property< Tag, T, Base > >
: mpl::and_< is_bitwise_serializable< T >, is_bitwise_serializable< Base > >
{
};

template < typename Tag, typename T, typename Base >
struct implementation_level< property< Tag, T, Base > >
: mpl::int_< object_serializable >
{
};

template < typename Tag, typename T, typename Base >
struct tracking_level< property< Tag, T, Base > > : mpl::int_< track_never >
{
};

}
#endif // BOOST_GRAPH_USE_MPI

} // end namespace boost

#ifdef BOOST_GRAPH_USE_MPI
namespace boost
{
namespace mpi
{
template <> struct is_mpi_datatype< boost::no_property > : mpl::true_
{
};

}
} // end namespace boost::mpi

BOOST_IS_BITWISE_SERIALIZABLE(boost::no_property)
BOOST_CLASS_IMPLEMENTATION(boost::no_property, object_serializable)
BOOST_CLASS_TRACKING(boost::no_property, track_never)
#endif // BOOST_GRAPH_USE_MPI

#endif // BOOST_PROPERTY_SERIALIZE_HPP
Loading