diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index b213e5498..882f6fb5b 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -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 ; diff --git a/include/boost/graph/breadth_first_search.hpp b/include/boost/graph/breadth_first_search.hpp index d1493cf20..8dae81825 100644 --- a/include/boost/graph/breadth_first_search.hpp +++ b/include/boost/graph/breadth_first_search.hpp @@ -24,11 +24,8 @@ #include #include #include -#include #include -#include BOOST_GRAPH_MPI_INCLUDE() - namespace boost { @@ -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 @@ -393,6 +381,4 @@ namespace graph } // namespace boost -#include BOOST_GRAPH_MPI_INCLUDE() - #endif // BOOST_GRAPH_BREADTH_FIRST_SEARCH_HPP diff --git a/include/boost/graph/connected_components.hpp b/include/boost/graph/connected_components.hpp index 75e76a073..0187b17c4 100644 --- a/include/boost/graph/connected_components.hpp +++ b/include/boost/graph/connected_components.hpp @@ -16,7 +16,6 @@ #include #include #include -#include #include #include @@ -109,6 +108,4 @@ connected_components(const Graph& g, } // namespace boost -#include BOOST_GRAPH_MPI_INCLUDE() - #endif // BOOST_GRAPH_CONNECTED_COMPONENTS_HPP diff --git a/include/boost/graph/depth_first_search.hpp b/include/boost/graph/depth_first_search.hpp index 4ad4e160f..2d6b60c4a 100644 --- a/include/boost/graph/depth_first_search.hpp +++ b/include/boost/graph/depth_first_search.hpp @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -421,6 +420,4 @@ void depth_first_visit(const IncidenceGraph& g, } } // namespace boost -#include BOOST_GRAPH_MPI_INCLUDE() - #endif diff --git a/include/boost/graph/detail/empty_header.hpp b/include/boost/graph/detail/empty_header.hpp deleted file mode 100644 index fde367255..000000000 --- a/include/boost/graph/detail/empty_header.hpp +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef BOOST_GRAPH_DETAIL_EMPTY_HEADER_HPP_INCLUDED -#define BOOST_GRAPH_DETAIL_EMPTY_HEADER_HPP_INCLUDED - -// Copyright 2018 Peter Dimov -// -// Use, modification and distribution are subject to the -// Boost Software License, Version 1.0 (See accompanying file -// LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - -#endif // #ifndef BOOST_GRAPH_DETAIL_EMPTY_HEADER_HPP_INCLUDED diff --git a/include/boost/graph/detail/mpi_include.hpp b/include/boost/graph/detail/mpi_include.hpp deleted file mode 100644 index f64592dab..000000000 --- a/include/boost/graph/detail/mpi_include.hpp +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef BOOST_GRAPH_DETAIL_MPI_INCLUDE_HPP_INCLUDED -#define BOOST_GRAPH_DETAIL_MPI_INCLUDE_HPP_INCLUDED - -// Copyright 2018 Peter Dimov -// -// Use, modification and distribution are subject to the -// Boost Software License, Version 1.0 (See accompanying file -// LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - -#if defined BOOST_GRAPH_USE_MPI -#define BOOST_GRAPH_MPI_INCLUDE(x) x -#else -#define BOOST_GRAPH_MPI_INCLUDE(x) -#endif - -#endif // #ifndef BOOST_GRAPH_DETAIL_MPI_INCLUDE_HPP_INCLUDED diff --git a/include/boost/graph/dijkstra_shortest_paths.hpp b/include/boost/graph/dijkstra_shortest_paths.hpp index f44291d7d..6b83620fe 100644 --- a/include/boost/graph/dijkstra_shortest_paths.hpp +++ b/include/boost/graph/dijkstra_shortest_paths.hpp @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -575,6 +574,4 @@ inline void dijkstra_shortest_paths(const VertexListGraph& g, } // namespace boost -#include BOOST_GRAPH_MPI_INCLUDE() - #endif // BOOST_GRAPH_DIJKSTRA_HPP diff --git a/include/boost/graph/fruchterman_reingold.hpp b/include/boost/graph/fruchterman_reingold.hpp index 5d60674cf..04b2566ad 100644 --- a/include/boost/graph/fruchterman_reingold.hpp +++ b/include/boost/graph/fruchterman_reingold.hpp @@ -14,7 +14,6 @@ #include #include #include // For topology concepts -#include #include #include #include // for std::min and std::max @@ -455,6 +454,4 @@ void fruchterman_reingold_force_directed_layout( } // end namespace boost -#include BOOST_GRAPH_MPI_INCLUDE() - #endif // BOOST_GRAPH_FRUCHTERMAN_REINGOLD_FORCE_DIRECTED_LAYOUT_HPP diff --git a/include/boost/graph/graphviz.hpp b/include/boost/graph/graphviz.hpp index e798017fc..7efe01633 100644 --- a/include/boost/graph/graphviz.hpp +++ b/include/boost/graph/graphviz.hpp @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -965,6 +964,4 @@ bool read_graphviz(std::istream& in, MutableGraph& graph, } // namespace boost -#include BOOST_GRAPH_MPI_INCLUDE() - #endif // BOOST_GRAPHVIZ_HPP diff --git a/include/boost/graph/one_bit_color_map.hpp b/include/boost/graph/one_bit_color_map.hpp index 44a19b3ec..d3a1ab98a 100644 --- a/include/boost/graph/one_bit_color_map.hpp +++ b/include/boost/graph/one_bit_color_map.hpp @@ -16,7 +16,6 @@ #include #include -#include #include #include #include @@ -101,6 +100,4 @@ inline one_bit_color_map< IndexMap > make_one_bit_color_map( } // end namespace boost -#include BOOST_GRAPH_MPI_INCLUDE() - #endif // BOOST_ONE_BIT_COLOR_MAP_HPP diff --git a/include/boost/graph/page_rank.hpp b/include/boost/graph/page_rank.hpp index 54170da54..7d5f4a166 100644 --- a/include/boost/graph/page_rank.hpp +++ b/include/boost/graph/page_rank.hpp @@ -16,7 +16,6 @@ #include #include #include -#include #include namespace boost @@ -174,6 +173,4 @@ namespace graph } } // end namespace boost::graph -#include BOOST_GRAPH_MPI_INCLUDE() - #endif // BOOST_GRAPH_PAGE_RANK_HPP diff --git a/include/boost/graph/rmat_graph_generator.hpp b/include/boost/graph/rmat_graph_generator.hpp index 916517a8a..4e935adc7 100644 --- a/include/boost/graph/rmat_graph_generator.hpp +++ b/include/boost/graph/rmat_graph_generator.hpp @@ -20,7 +20,6 @@ #include #include #include -#include #include #include // #include @@ -658,6 +657,4 @@ class sorted_unique_rmat_iterator } // end namespace boost -#include BOOST_GRAPH_MPI_INCLUDE() - #endif // BOOST_GRAPH_RMAT_GENERATOR_HPP diff --git a/include/boost/graph/strong_components.hpp b/include/boost/graph/strong_components.hpp index 18e3f8fad..52b52613f 100644 --- a/include/boost/graph/strong_components.hpp +++ b/include/boost/graph/strong_components.hpp @@ -18,7 +18,6 @@ #include #include #include -#include #include namespace boost @@ -342,6 +341,4 @@ kosaraju_strong_components( } // namespace boost -#include BOOST_GRAPH_MPI_INCLUDE() - #endif // BOOST_GRAPH_STRONG_COMPONENTS_HPP diff --git a/include/boost/graph/two_bit_color_map.hpp b/include/boost/graph/two_bit_color_map.hpp index 9e25f2716..f63889eaa 100644 --- a/include/boost/graph/two_bit_color_map.hpp +++ b/include/boost/graph/two_bit_color_map.hpp @@ -15,7 +15,6 @@ #include #include -#include #include #include #include @@ -105,6 +104,4 @@ inline two_bit_color_map< IndexMap > make_two_bit_color_map( } // end namespace boost -#include BOOST_GRAPH_MPI_INCLUDE() - #endif // BOOST_TWO_BIT_COLOR_MAP_HPP diff --git a/include/boost/graph/use_mpi.hpp b/include/boost/graph/use_mpi.hpp deleted file mode 100644 index b77f9c0b5..000000000 --- a/include/boost/graph/use_mpi.hpp +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (C) 2004-2009 The Trustees of Indiana University. - -// Use, modification and distribution is subject to the Boost Software -// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// Authors: Nick Edmonds -// Andrew Lumsdaine - -#ifndef BOOST_GRAPH_USE_MPI_HPP -#define BOOST_GRAPH_USE_MPI_HPP - -#define BOOST_GRAPH_USE_MPI - -#endif // BOOST_GRAPH_USE_MPI_HPP diff --git a/include/boost/pending/property_serialize.hpp b/include/boost/pending/property_serialize.hpp index f4910111d..a6119198c 100644 --- a/include/boost/pending/property_serialize.hpp +++ b/include/boost/pending/property_serialize.hpp @@ -9,14 +9,6 @@ #include #include -// 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 -#include BOOST_GRAPH_BLOCK_BOOSTDEP_HEADER -#undef BOOST_GRAPH_BLOCK_BOOSTDEP_HEADER -#endif - namespace boost { template < class Archive > @@ -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