|
|
Boost-Commit : |
From: troy_at_[hidden]
Date: 2008-06-29 11:52:27
Author: troy
Date: 2008-06-29 11:52:25 EDT (Sun, 29 Jun 2008)
New Revision: 46865
URL: http://svn.boost.org/trac/boost/changeset/46865
Log:
merge from release branch
Added:
branches/CMake/release/libs/mpi/src/python/py_nonblocking.cpp
- copied unchanged from r46809, /branches/release/libs/mpi/src/python/py_nonblocking.cpp
branches/CMake/release/libs/mpi/src/python/request_with_value.hpp
- copied unchanged from r46809, /branches/release/libs/mpi/src/python/request_with_value.hpp
Text files modified:
branches/CMake/release/libs/mpi/build/Jamfile.v2 | 1
branches/CMake/release/libs/mpi/build/__init__.py | 4
branches/CMake/release/libs/mpi/doc/mpi.qbk | 3
branches/CMake/release/libs/mpi/src/CMakeLists.txt | 3
branches/CMake/release/libs/mpi/src/content_oarchive.cpp | 3
branches/CMake/release/libs/mpi/src/mpi_datatype_cache.cpp | 35 ++++----
branches/CMake/release/libs/mpi/src/packed_skeleton_iarchive.cpp | 4
branches/CMake/release/libs/mpi/src/packed_skeleton_oarchive.cpp | 3
branches/CMake/release/libs/mpi/src/point_to_point.cpp | 2
branches/CMake/release/libs/mpi/src/python/documentation.cpp | 150 ++++++++++++++++++++++++++++++++--------
branches/CMake/release/libs/mpi/src/python/module.cpp | 4
branches/CMake/release/libs/mpi/src/python/py_communicator.cpp | 13 +-
branches/CMake/release/libs/mpi/src/python/py_exception.cpp | 9 +-
branches/CMake/release/libs/mpi/src/python/py_request.cpp | 90 +++++++++++++++++------
branches/CMake/release/libs/mpi/src/python/py_timer.cpp | 2
branches/CMake/release/libs/mpi/src/python/skeleton_and_content.cpp | 21 ++--
branches/CMake/release/libs/mpi/src/python/status.cpp | 2
branches/CMake/release/libs/mpi/test/broadcast_test.cpp | 1
18 files changed, 245 insertions(+), 105 deletions(-)
Modified: branches/CMake/release/libs/mpi/build/Jamfile.v2
==============================================================================
--- branches/CMake/release/libs/mpi/build/Jamfile.v2 (original)
+++ branches/CMake/release/libs/mpi/build/Jamfile.v2 2008-06-29 11:52:25 EDT (Sun, 29 Jun 2008)
@@ -82,6 +82,7 @@
python/datatypes.cpp
python/documentation.cpp
python/py_environment.cpp
+ python/py_nonblocking.cpp
python/py_exception.cpp
python/module.cpp
python/py_request.cpp
Modified: branches/CMake/release/libs/mpi/build/__init__.py
==============================================================================
--- branches/CMake/release/libs/mpi/build/__init__.py (original)
+++ branches/CMake/release/libs/mpi/build/__init__.py 2008-06-29 11:52:25 EDT (Sun, 29 Jun 2008)
@@ -1,10 +1,10 @@
import sys
if sys.platform == 'linux2':
- import dl
+ import DLFCN as dl
flags = sys.getdlopenflags()
sys.setdlopenflags(dl.RTLD_NOW|dl.RTLD_GLOBAL)
import mpi
sys.setdlopenflags(flags)
else:
-import mpi
+ import mpi
Modified: branches/CMake/release/libs/mpi/doc/mpi.qbk
==============================================================================
--- branches/CMake/release/libs/mpi/doc/mpi.qbk (original)
+++ branches/CMake/release/libs/mpi/doc/mpi.qbk 2008-06-29 11:52:25 EDT (Sun, 29 Jun 2008)
@@ -2025,6 +2025,9 @@
[section:history Revision History]
+* *Boost 1.36.0*:
+ * Support for non-blocking operations in Python, from Andreas Klöckner
+
* *Boost 1.35.0*: Initial release, containing the following post-review changes
* Support for arrays in all collective operations
* Support default-construction of [classref boost::mpi::environment environment]
Modified: branches/CMake/release/libs/mpi/src/CMakeLists.txt
==============================================================================
--- branches/CMake/release/libs/mpi/src/CMakeLists.txt (original)
+++ branches/CMake/release/libs/mpi/src/CMakeLists.txt 2008-06-29 11:52:25 EDT (Sun, 29 Jun 2008)
@@ -27,3 +27,6 @@
LINK_LIBS ${MPI_LIBRARIES}
SHARED_COMPILE_FLAGS "-DBOOST_MPI_DYN_LINK=1"
)
+
+message(STATUS "boost::mpi::python needs love")
+
Modified: branches/CMake/release/libs/mpi/src/content_oarchive.cpp
==============================================================================
--- branches/CMake/release/libs/mpi/src/content_oarchive.cpp (original)
+++ branches/CMake/release/libs/mpi/src/content_oarchive.cpp 2008-06-29 11:52:25 EDT (Sun, 29 Jun 2008)
@@ -14,5 +14,6 @@
// explicitly instantiate all required template functions
template class archive_pointer_oserializer<mpi::detail::content_oarchive> ;
-
+template class archive_pointer_oserializer<boost::mpi::detail::ignore_skeleton_oarchive<boost::mpi::detail::content_oarchive> >;
+template class archive_pointer_oserializer<boost::mpi::detail::ignore_skeleton_oarchive<boost::mpi::detail::mpi_datatype_oarchive> >;
} } }
Modified: branches/CMake/release/libs/mpi/src/mpi_datatype_cache.cpp
==============================================================================
--- branches/CMake/release/libs/mpi/src/mpi_datatype_cache.cpp (original)
+++ branches/CMake/release/libs/mpi/src/mpi_datatype_cache.cpp 2008-06-29 11:52:25 EDT (Sun, 29 Jun 2008)
@@ -13,16 +13,16 @@
namespace boost { namespace mpi { namespace detail {
typedef std::map<std::type_info const*,MPI_Datatype,type_info_compare>
- stored_map_type;
+ stored_map_type;
struct mpi_datatype_map::implementation
{
- stored_map_type map;
+ stored_map_type map;
};
mpi_datatype_map::mpi_datatype_map()
{
- impl = new implementation();
+ impl = new implementation();
}
mpi_datatype_map::~mpi_datatype_map()
@@ -30,32 +30,31 @@
// do not free after call to MPI_FInalize
int finalized=0;
BOOST_MPI_CHECK_RESULT(MPI_Finalized,(&finalized));
- if (!finalized) {
- // ignore errors in the destructor
- for (stored_map_type::iterator it=impl->map.begin(); it != impl->map.end(); ++it) {
- MPI_Type_free(&(it->second));
- }
- }
- delete impl;
+ if (!finalized) {
+ // ignore errors in the destructor
+ for (stored_map_type::iterator it=impl->map.begin(); it != impl->map.end(); ++it)
+ MPI_Type_free(&(it->second));
+ }
+ delete impl;
}
MPI_Datatype mpi_datatype_map::get(const std::type_info* t)
{
- stored_map_type::iterator pos = impl->map.find(t);
- if (pos != impl->map.end())
- return pos->second;
- else
- return MPI_DATATYPE_NULL;
+ stored_map_type::iterator pos = impl->map.find(t);
+ if (pos != impl->map.end())
+ return pos->second;
+ else
+ return MPI_DATATYPE_NULL;
}
void mpi_datatype_map::set(const std::type_info* t, MPI_Datatype datatype)
{
- impl->map[t] = datatype;
+ impl->map[t] = datatype;
}
mpi_datatype_map& mpi_datatype_cache()
{
- static mpi_datatype_map cache;
- return cache;
+ static mpi_datatype_map cache;
+ return cache;
}
} } }
Modified: branches/CMake/release/libs/mpi/src/packed_skeleton_iarchive.cpp
==============================================================================
--- branches/CMake/release/libs/mpi/src/packed_skeleton_iarchive.cpp (original)
+++ branches/CMake/release/libs/mpi/src/packed_skeleton_iarchive.cpp 2008-06-29 11:52:25 EDT (Sun, 29 Jun 2008)
@@ -8,7 +8,6 @@
#define BOOST_ARCHIVE_SOURCE
#include <boost/archive/impl/archive_pointer_iserializer.ipp>
-#include <boost/archive/impl/archive_pointer_oserializer.ipp>
#include <boost/mpi/skeleton_and_content.hpp>
#include <boost/archive/binary_iarchive.hpp>
@@ -21,6 +20,9 @@
template class basic_binary_iarchive<mpi::packed_skeleton_iarchive> ;
template class detail::archive_pointer_iserializer<mpi::packed_skeleton_iarchive> ;
+template class detail::archive_pointer_iserializer<
+ mpi::detail::forward_skeleton_iarchive<
+ boost::mpi::packed_skeleton_iarchive, boost::mpi::packed_iarchive> > ;
//template class binary_iarchive_impl<packed_skeleton_iarchive> ;
} } // end namespace boost::archive
Modified: branches/CMake/release/libs/mpi/src/packed_skeleton_oarchive.cpp
==============================================================================
--- branches/CMake/release/libs/mpi/src/packed_skeleton_oarchive.cpp (original)
+++ branches/CMake/release/libs/mpi/src/packed_skeleton_oarchive.cpp 2008-06-29 11:52:25 EDT (Sun, 29 Jun 2008)
@@ -18,6 +18,9 @@
// explicitly instantiate all required templates
template class detail::archive_pointer_oserializer<mpi::packed_skeleton_oarchive> ;
+template class detail::archive_pointer_oserializer<
+ mpi::detail::forward_skeleton_oarchive<
+ boost::mpi::packed_skeleton_oarchive, boost::mpi::packed_oarchive> > ;
template class basic_binary_oarchive<mpi::packed_skeleton_oarchive> ;
//template class binary_oarchive_impl<mpi_packed_oarchive> ;
Modified: branches/CMake/release/libs/mpi/src/point_to_point.cpp
==============================================================================
--- branches/CMake/release/libs/mpi/src/point_to_point.cpp (original)
+++ branches/CMake/release/libs/mpi/src/point_to_point.cpp 2008-06-29 11:52:25 EDT (Sun, 29 Jun 2008)
@@ -32,7 +32,7 @@
BOOST_MPI_CHECK_RESULT(MPI_Send,
(const_cast<void*>(size), 1,
get_mpi_datatype<std::size_t>(ar.size()),
- dest, tag, comm));
+ dest, tag, comm));
BOOST_MPI_CHECK_RESULT(MPI_Send,
(const_cast<void*>(ar.address()), ar.size(),
MPI_PACKED,
Modified: branches/CMake/release/libs/mpi/src/python/documentation.cpp
==============================================================================
--- branches/CMake/release/libs/mpi/src/python/documentation.cpp (original)
+++ branches/CMake/release/libs/mpi/src/python/documentation.cpp 2008-06-29 11:52:25 EDT (Sun, 29 Jun 2008)
@@ -132,10 +132,10 @@
"\n"
" Once you have registered your C++ data structures, you can extract\n"
" the skeleton for an instance of that data structure with skeleton().\n"
- " The resulting skeleton_proxy can be transmitted via the normal send\n"
+ " The resulting SkeletonProxy can be transmitted via the normal send\n"
" routine, e.g.,\n\n"
" mpi.world.send(1, 0, skeleton(my_data_structure))\n\n"
- " skeleton_proxy objects can be received on the other end via recv(),\n"
+ " SkeletonProxy objects can be received on the other end via recv(),\n"
" which stores a newly-created instance of your data structure with the\n"
" same `shape' as the sender in its `object' attribute:\n\n"
" shape = mpi.world.recv(0, 0)\n"
@@ -212,6 +212,86 @@
"Determine if the MPI environment has already been finalized.\n";
/***********************************************************
+ * nonblocking documentation *
+ ***********************************************************/
+const char* request_list_init_docstring=
+ "Without arguments, constructs an empty RequestList.\n"
+ "With one argument `iterable', copies request objects from this\n"
+ "iterable to the new RequestList.\n";
+
+const char* nonblocking_wait_any_docstring =
+ "Waits until any of the given requests has been completed. It provides\n"
+ "functionality equivalent to MPI_Waitany.\n"
+ "\n"
+ "requests must be a RequestList instance.\n"
+ "\n"
+ "Returns a triple (value, status, index) consisting of received value\n"
+ "(or None), the Status object for the completed request, and its index\n"
+ "in the RequestList.\n";
+
+const char* nonblocking_test_any_docstring =
+ "Tests if any of the given requests have been completed, but does not wait\n"
+ "for completion. It provides functionality equivalent to MPI_Testany.\n"
+ "\n"
+ "requests must be a RequestList instance.\n"
+ "\n"
+ "Returns a triple (value, status, index) like wait_any or None if no request\n"
+ "is complete.\n";
+
+const char* nonblocking_wait_all_docstring =
+ "Waits until all of the given requests have been completed. It provides\n"
+ "functionality equivalent to MPI_Waitall.\n"
+ "\n"
+ "requests must be a RequestList instance.\n"
+ "\n"
+ "If the second parameter `callable' is provided, it is called with each\n"
+ "completed request's received value (or None) and it s Status object as\n"
+ "its arguments. The calls occur in the order given by the `requests' list.\n";
+
+const char* nonblocking_test_all_docstring =
+ "Tests if all of the given requests have been completed. It provides\n"
+ "functionality equivalent to MPI_Testall.\n"
+ "\n"
+ "Returns True if all requests have been completed.\n"
+ "\n"
+ "requests must be a RequestList instance.\n"
+ "\n"
+ "If the second parameter `callable' is provided, it is called with each\n"
+ "completed request's received value (or None) and it s Status object as\n"
+ "its arguments. The calls occur in the order given by the `requests' list.\n";
+
+const char* nonblocking_wait_some_docstring =
+ "Waits until at least one of the given requests has completed. It\n"
+ "then completes all of the requests it can, partitioning the input\n"
+ "sequence into pending requests followed by completed requests.\n"
+ "\n"
+ "This routine provides functionality equivalent to MPI_Waitsome.\n"
+ "\n"
+ "Returns the index of the first completed request."
+ "\n"
+ "requests must be a RequestList instance.\n"
+ "\n"
+ "If the second parameter `callable' is provided, it is called with each\n"
+ "completed request's received value (or None) and it s Status object as\n"
+ "its arguments. The calls occur in the order given by the `requests' list.\n";
+
+const char* nonblocking_test_some_docstring =
+ "Tests to see if any of the given requests has completed. It completes\n"
+ "all of the requests it can, partitioning the input sequence into pending\n"
+ "requests followed by completed requests. This routine is similar to\n"
+ "wait_some, but does not wait until any requests have completed.\n"
+ "\n"
+ "This routine provides functionality equivalent to MPI_Testsome.\n"
+ "\n"
+ "Returns the index of the first completed request."
+ "\n"
+ "requests must be a RequestList instance.\n"
+ "\n"
+ "If the second parameter `callable' is provided, it is called with each\n"
+ "completed request's received value (or None) and it s Status object as\n"
+ "its arguments. The calls occur in the order given by the `requests' list.\n";
+
+/***********************************************************
* exception documentation *
***********************************************************/
const char* exception_docstring =
@@ -310,14 +390,14 @@
* communicator documentation *
***********************************************************/
const char* communicator_docstring =
- "The communicator class abstracts a set of communicating\n"
+ "The Communicator class abstracts a set of communicating\n"
"processes in MPI. All of the processes that belong to a certain\n"
"communicator can determine the size of the communicator, their rank\n"
"within the communicator, and communicate with any other processes\n"
"in the communicator.\n";
const char* communicator_default_constructor_docstring =
- "Build a new Boost.MPI communicator for MPI_COMM_WORLD.\n";
+ "Build a new Boost.MPI Communicator instance for MPI_COMM_WORLD.\n";
const char* communicator_rank_docstring =
"Returns the rank of the process in the communicator, which will be a\n"
@@ -335,10 +415,10 @@
" - For C++ objects registered via register_serialized(), the value\n"
" will be serialized and transmitted.\n"
"\n"
- " - For skeleton_proxy objects, the skeleton of the object will be\n"
+ " - For SkeletonProxy objects, the skeleton of the object will be\n"
" serialized and transmitted.\n"
"\n"
- " - For content objects, the content will be transmitted directly.\n"
+ " - For Content objects, the content will be transmitted directly.\n"
" This content can be received by a matching recv/irecv call that\n"
" provides a suitable `buffer' argument.\n"
"\n"
@@ -351,12 +431,12 @@
"the message can be received from any process. Likewise, if the tag\n"
"parameter is not specified, a message with any tag can be received.\n"
"If return_status is True, returns a tuple containing the received\n"
- "object followed by a status object describing the communication.\n"
+ "object followed by a Status object describing the communication.\n"
"Otherwise, recv() returns just the received object.\n"
"\n"
"When receiving the content of a data type that has been sent separately\n"
"from its skeleton, user code must provide a value for the `buffer'\n"
- "argument. This value should be the content object returned from\n"
+ "argument. This value should be the Content object returned from\n"
"get_content().\n";
const char* communicator_isend_docstring =
@@ -364,7 +444,7 @@
"tag to the process with rank dest. It can be received by the\n"
"destination process with a matching recv call. The value will be\n"
"transmitted in the same way as with send().\n"
- "This routine returns a request object, which can be used to query\n"
+ "This routine returns a Request object, which can be used to query\n"
"when the transmission has completed, wait for its completion, or\n"
"cancel the transmission.\n";
@@ -373,15 +453,15 @@
"source with the given tag. If the source parameter is not specified,\n"
"the message can be received from any process. Likewise, if the tag\n"
"parameter is not specified, a message with any tag can be received.\n"
- "This routine returns a request object, which can be used to query\n"
+ "This routine returns a Request object, which can be used to query\n"
"when the transmission has completed, wait for its completion, or\n"
"cancel the transmission. The received value be accessible\n"
- "through the `value' attribute of the request object once transmission\n"
+ "through the `value' attribute of the Request object once transmission\n"
"has completed.\n"
"\n"
"As with the recv() routine, when receiving the content of a data type\n"
"that has been sent separately from its skeleton, user code must provide\n"
- "a value for the `buffer' argument. This value should be the content\n"
+ "a value for the `buffer' argument. This value should be the Content\n"
"object returned from get_content().\n";
const char* communicator_probe_docstring =
@@ -389,7 +469,7 @@
"is available to be received. It then returns information about\n"
"that message. If source is omitted, a message from any process\n"
"will match. If tag is omitted, a message with any tag will match.\n"
- "The actual source and tag can be retrieved from the returned status\n"
+ "The actual source and tag can be retrieved from the returned Status\n"
"object. To check if a message is available without blocking, use\n"
"iprobe.\n";
@@ -399,7 +479,7 @@
"message; otherwise, it returns None. If source is omitted, a message\n"
"from any process will match. If tag is omitted, a message with any\n"
"tag will match. The actual source and tag can be retrieved from the\n"
- "returned status object. To wait for a message to become available, use\n"
+ "returned Status object. To wait for a message to become available, use\n"
"probe.\n";
const char* communicator_barrier_docstring =
@@ -418,8 +498,8 @@
"the ordering of processes with the same color in the resulting\n"
"communicator. If omitted, the key will default to the rank of\n"
"the process in the current communicator.\n\n"
- "Returns a new communicator containing all of the processes in\n"
- "this communicator that have the same color.\n";
+ "Returns a new Communicator instance containing all of the \n"
+ "processes in this communicator that have the same color.\n";
const char* communicator_abort_docstring =
"Makes a \"best attempt\" to abort all of the tasks in the group of\n"
@@ -435,36 +515,46 @@
* request documentation *
***********************************************************/
const char* request_docstring =
- "The request class contains information about a non-blocking send\n"
+ "The Request class contains information about a non-blocking send\n"
"or receive and will be returned from isend or irecv, respectively.\n"
- "When a request object represents a completed irecv, the `value' \n"
+ "When a Request object represents a completed irecv, the `value' \n"
"attribute will contain the received value.\n";
+const char* request_with_value_docstring =
+ "This class is an implementation detail. Any call that accepts a\n"
+ "Request also accepts a RequestWithValue, and vice versa.\n";
+
const char* request_wait_docstring =
"Wait until the communication associated with this request has\n"
"completed. For a request that is associated with an isend(), returns\n"
- "a status object describing the communication. For an irecv()\n"
+ "a Status object describing the communication. For an irecv()\n"
"operation, returns the received value by default. However, when\n"
- "return_status=True, a (value, status) pair is returned by a.\n"
+ "return_status=True, a (value, status) pair is returned by a\n"
"completed irecv request.\n";
const char* request_test_docstring =
"Determine whether the communication associated with this request\n"
- "has completed successfully. If so, returns the status object\n"
+ "has completed successfully. If so, returns the Status object\n"
"describing the communication (for an isend request) or a tuple\n"
- "containing the received value and a status object (for an irecv\n"
- "request). Note that once test() returns a status object, the\n"
+ "containing the received value and a Status object (for an irecv\n"
+ "request). Note that once test() returns a Status object, the\n"
"request has completed and wait() should not be called.\n";
const char* request_cancel_docstring =
"Cancel a pending communication, assuming it has not already been\n"
"completed.\n";
+const char* request_value_docstring =
+ "If this request originated in an irecv(), this property makes the"
+ "sent value accessible once the request completes.\n"
+ "\n"
+ "If no value is available, ValueError is raised.\n";
+
/***********************************************************
* skeleton/content documentation *
***********************************************************/
const char* object_without_skeleton_docstring =
- "The object_without_skeleton class is an exception class used only\n"
+ "The ObjectWithoutSkeleton class is an exception class used only\n"
"when the skeleton() or get_content() function is called with an\n"
"object that is not supported by the skeleton/content mechanism.\n"
"All C++ types for which skeletons and content can be transmitted\n"
@@ -475,13 +565,13 @@
"The object on which skeleton() or get_content() was invoked.\n";
const char* skeleton_proxy_docstring =
- "The skeleton_proxy class is used to represent the skeleton of an\n"
- "object. The skeleton_proxy can be used as the value parameter of\n"
+ "The SkeletonProxy class is used to represent the skeleton of an\n"
+ "object. The SkeletonProxy can be used as the value parameter of\n"
"send() or isend() operations, but instead of transmitting the\n"
"entire object, only its skeleton (\"shape\") will be sent, without\n"
"the actual data. Its content can then be transmitted, separately.\n"
"\n"
- "User code cannot generate skeleton_proxy instances directly. To\n"
+ "User code cannot generate SkeletonProxy instances directly. To\n"
"refer to the skeleton of an object, use skeleton(object). Skeletons\n"
"can also be received with the recv() and irecv() methods.\n"
"\n"
@@ -503,7 +593,7 @@
"skeleton/content mechanism.\n";
const char* skeleton_docstring =
- "The skeleton function retrieves the skeleton_proxy for its object\n"
+ "The skeleton function retrieves the SkeletonProxy for its object\n"
"parameter, allowing the transmission of the skeleton (or \"shape\")\n"
"of the object separately from its data. The skeleton/content mechanism\n"
"is useful when a large data structure remains structurally the same\n"
@@ -534,7 +624,7 @@
* status documentation *
***********************************************************/
const char* status_docstring =
- "The status class stores information about a given message, including\n"
+ "The Status class stores information about a given message, including\n"
"its source, tag, and whether the message transmission was cancelled\n"
"or resulted in an error.\n";
@@ -554,7 +644,7 @@
* timer documentation *
***********************************************************/
const char* timer_docstring =
- "The timer class is a simple wrapper around the MPI timing facilities.\n";
+ "The Timer class is a simple wrapper around the MPI timing facilities.\n";
const char* timer_default_constructor_docstring =
"Initializes the timer. After this call, elapsed == 0.\n";
Modified: branches/CMake/release/libs/mpi/src/python/module.cpp
==============================================================================
--- branches/CMake/release/libs/mpi/src/python/module.cpp (original)
+++ branches/CMake/release/libs/mpi/src/python/module.cpp 2008-06-29 11:52:25 EDT (Sun, 29 Jun 2008)
@@ -27,6 +27,7 @@
extern void export_request();
extern void export_status();
extern void export_timer();
+extern void export_nonblocking();
extern const char* module_docstring;
@@ -35,7 +36,7 @@
// Setup module documentation
scope().attr("__doc__") = module_docstring;
scope().attr("__author__") = "Douglas Gregor <doug.gregor_at_[hidden]>";
- scope().attr("__date__") = "$LastChangedDate: 2006-07-16 15:25:47 -0400 (Sun, 16 Jul 2006) $";
+ scope().attr("__date__") = "$LastChangedDate$";
scope().attr("__version__") = "$Revision$";
scope().attr("__copyright__") = "Copyright (C) 2006 Douglas Gregor";
scope().attr("__license__") = "http://www.boost.org/LICENSE_1_0.txt";
@@ -48,6 +49,7 @@
export_request();
export_status();
export_timer();
+ export_nonblocking();
}
} } } // end namespace boost::mpi::python
Modified: branches/CMake/release/libs/mpi/src/python/py_communicator.cpp
==============================================================================
--- branches/CMake/release/libs/mpi/src/python/py_communicator.cpp (original)
+++ branches/CMake/release/libs/mpi/src/python/py_communicator.cpp 2008-06-29 11:52:25 EDT (Sun, 29 Jun 2008)
@@ -14,6 +14,7 @@
#include <boost/python.hpp>
#include <boost/mpi.hpp>
#include <boost/mpi/python/serialize.hpp>
+#include "request_with_value.hpp"
using namespace boost::python;
using namespace boost::mpi;
@@ -49,14 +50,12 @@
return result;
}
-object
+request_with_value
communicator_irecv(const communicator& comm, int source, int tag)
{
- using boost::python::make_tuple;
-
- object result;
- object req(comm.irecv(source, tag, result));
- req.attr("value") = result;
+ boost::shared_ptr<object> result(new object());
+ request_with_value req(comm.irecv(source, tag, *result));
+ req.m_internal_value = result;
return req;
}
@@ -76,7 +75,7 @@
using boost::python::arg;
using boost::python::object;
- class_<communicator> comm("communicator", communicator_docstring);
+ class_<communicator> comm("Communicator", communicator_docstring);
comm
.def(init<>())
.add_property("rank", &communicator::rank, communicator_rank_docstring)
Modified: branches/CMake/release/libs/mpi/src/python/py_exception.cpp
==============================================================================
--- branches/CMake/release/libs/mpi/src/python/py_exception.cpp (original)
+++ branches/CMake/release/libs/mpi/src/python/py_exception.cpp 2008-06-29 11:52:25 EDT (Sun, 29 Jun 2008)
@@ -30,9 +30,8 @@
str exception_str(const exception& e)
{
- return str("MPI routine `" + std::string(e.routine()) +
- "' returned error code " +
- lexical_cast<std::string>(e.result_code()));
+ return str(std::string(e.what()) +
+ " (code " + lexical_cast<std::string>(e.result_code())+")");
}
void export_exception()
@@ -42,10 +41,10 @@
object type =
class_<exception>
- ("exception", exception_docstring, no_init)
+ ("Exception", exception_docstring, no_init)
.add_property("what", &exception::what, exception_what_docstring)
.add_property("routine", &exception::what, exception_routine_docstring)
- .add_property("result_code", &exception::what,
+ .add_property("result_code", &exception::result_code,
exception_result_code_docstring)
.def("__str__", &exception_str)
;
Modified: branches/CMake/release/libs/mpi/src/python/py_request.cpp
==============================================================================
--- branches/CMake/release/libs/mpi/src/python/py_request.cpp (original)
+++ branches/CMake/release/libs/mpi/src/python/py_request.cpp 2008-06-29 11:52:25 EDT (Sun, 29 Jun 2008)
@@ -13,52 +13,90 @@
*/
#include <boost/python.hpp>
#include <boost/mpi.hpp>
+#include "request_with_value.hpp"
using namespace boost::python;
using namespace boost::mpi;
-namespace boost { namespace mpi { namespace python {
-
-extern const char* request_docstring;
-extern const char* request_wait_docstring;
-extern const char* request_test_docstring;
-extern const char* request_cancel_docstring;
+const object python::request_with_value::get_value() const
+{
+ if (m_internal_value.get())
+ return *m_internal_value;
+ else if (m_external_value)
+ return *m_external_value;
+ else
+ {
+ PyErr_SetString(PyExc_ValueError, "request value not available");
+ throw boost::python::error_already_set();
+ }
+}
-object request_wait(object req_obj)
+const object python::request_with_value::get_value_or_none() const
{
- request& req = extract<request&>(req_obj)();
- status stat = req.wait();
- if (PyObject_HasAttrString(req_obj.ptr(), "value"))
- return boost::python::make_tuple(stat, req_obj.attr("value"));
+ if (m_internal_value.get())
+ return *m_internal_value;
+ else if (m_external_value)
+ return *m_external_value;
else
- return object(stat);
+ return object();
}
-object request_test(object req_obj)
+const object python::request_with_value::wrap_wait()
{
- request& req = extract<request&>(req_obj)();
+ status stat = request::wait();
+ if (m_internal_value.get() || m_external_value)
+ return boost::python::make_tuple(get_value(), stat);
+ else
+ return object(stat);
+}
- if (optional<status> stat = req.test())
- {
- if (PyObject_HasAttrString(req_obj.ptr(), "value"))
- return boost::python::make_tuple(stat, req_obj.attr("value"));
- else
- return object(stat);
- }
+const object python::request_with_value::wrap_test()
+{
+ ::boost::optional<status> stat = request::test();
+ if (stat)
+ {
+ if (m_internal_value.get() || m_external_value)
+ return boost::python::make_tuple(get_value(), *stat);
+ else
+ return object(*stat);
+ }
else
return object();
}
+
+namespace boost { namespace mpi { namespace python {
+
+extern const char* request_docstring;
+extern const char* request_with_value_docstring;
+extern const char* request_wait_docstring;
+extern const char* request_test_docstring;
+extern const char* request_cancel_docstring;
+extern const char* request_value_docstring;
+
void export_request()
{
using boost::python::arg;
using boost::python::object;
- class_<request>("request", request_docstring, no_init)
- .def("wait", &request_wait, request_wait_docstring)
- .def("test", &request_test, request_test_docstring)
- .def("cancel", &request::cancel, request_cancel_docstring)
- ;
+ {
+ typedef request cl;
+ class_<cl>("Request", request_docstring, no_init)
+ .def("wait", &cl::wait, request_wait_docstring)
+ .def("test", &cl::test, request_test_docstring)
+ .def("cancel", &cl::cancel, request_cancel_docstring)
+ ;
+ }
+ {
+ typedef request_with_value cl;
+ class_<cl, bases<request> >(
+ "RequestWithValue", request_with_value_docstring, no_init)
+ .def("wait", &cl::wrap_wait, request_wait_docstring)
+ .def("test", &cl::wrap_test, request_test_docstring)
+ ;
+ }
+
+ implicitly_convertible<request, request_with_value>();
}
} } } // end namespace boost::mpi::python
Modified: branches/CMake/release/libs/mpi/src/python/py_timer.cpp
==============================================================================
--- branches/CMake/release/libs/mpi/src/python/py_timer.cpp (original)
+++ branches/CMake/release/libs/mpi/src/python/py_timer.cpp 2008-06-29 11:52:25 EDT (Sun, 29 Jun 2008)
@@ -32,7 +32,7 @@
using boost::python::arg;
using boost::python::object;
- class_<timer>("timer", timer_docstring)
+ class_<timer>("Timer", timer_docstring)
.def(init<>())
.def("restart", &timer::restart, timer_restart_docstring)
.add_property("elapsed", &timer::elapsed, timer_elapsed_docstring)
Modified: branches/CMake/release/libs/mpi/src/python/skeleton_and_content.cpp
==============================================================================
--- branches/CMake/release/libs/mpi/src/python/skeleton_and_content.cpp (original)
+++ branches/CMake/release/libs/mpi/src/python/skeleton_and_content.cpp 2008-06-29 11:52:25 EDT (Sun, 29 Jun 2008)
@@ -16,6 +16,7 @@
#include <typeinfo>
#include <list>
#include "utility.hpp"
+#include "request_with_value.hpp"
using namespace boost::python;
using namespace boost::mpi;
@@ -114,14 +115,12 @@
/// Receive the content of a Python object. The request object's value
/// attribute will reference the object whose content is being
/// received, not the content wrapper.
-object
+request_with_value
communicator_irecv_content(const communicator& comm, int source, int tag,
- const content& c)
+ content& c)
{
- using boost::python::make_tuple;
-
- object req(comm.irecv(source, tag, c.base()));
- req.attr("value") = c.object;
+ request_with_value req(comm.irecv(source, tag, c.base()));
+ req.m_external_value = &c.object;
return req;
}
@@ -140,7 +139,7 @@
// Expose the object_without_skeleton exception
object type =
class_<object_without_skeleton>
- ("object_without_skeleton", object_without_skeleton_docstring, no_init)
+ ("ObjectWithoutSkeleton", object_without_skeleton_docstring, no_init)
.def_readonly("object", &object_without_skeleton::value,
object_without_skeleton_object_docstring)
.def("__str__", &object_without_skeleton_str)
@@ -150,11 +149,11 @@
// Expose the Python variants of "skeleton_proxy" and "content", and
// their generator functions.
detail::skeleton_proxy_base_type =
- class_<skeleton_proxy_base>("skeleton_proxy", skeleton_proxy_docstring,
+ class_<skeleton_proxy_base>("SkeletonProxy", skeleton_proxy_docstring,
no_init)
.def_readonly("object", &skeleton_proxy_base::object,
skeleton_proxy_object_docstring);
- class_<content>("content", content_docstring, no_init);
+ class_<content>("Content", content_docstring, no_init);
def("skeleton", &skeleton, arg("object"), skeleton_docstring);
def("get_content", &get_content, arg("object"), get_content_docstring);
@@ -166,7 +165,9 @@
(arg("source") = any_source, arg("tag") = any_tag, arg("buffer"),
arg("return_status") = false))
.def("irecv", communicator_irecv_content,
- (arg("source") = any_source, arg("tag") = any_tag, arg("buffer")));
+ (arg("source") = any_source, arg("tag") = any_tag, arg("buffer")),
+ with_custodian_and_ward_postcall<0, 4>()
+ );
}
} } } // end namespace boost::mpi::python
Modified: branches/CMake/release/libs/mpi/src/python/status.cpp
==============================================================================
--- branches/CMake/release/libs/mpi/src/python/status.cpp (original)
+++ branches/CMake/release/libs/mpi/src/python/status.cpp 2008-06-29 11:52:25 EDT (Sun, 29 Jun 2008)
@@ -30,7 +30,7 @@
using boost::python::arg;
using boost::python::object;
- class_<status>("status", status_docstring, no_init)
+ class_<status>("Status", status_docstring, no_init)
.add_property("source", &status::source, status_source_docstring)
.add_property("tag", &status::tag, status_tag_docstring)
.add_property("error", &status::error, status_error_docstring)
Modified: branches/CMake/release/libs/mpi/test/broadcast_test.cpp
==============================================================================
--- branches/CMake/release/libs/mpi/test/broadcast_test.cpp (original)
+++ branches/CMake/release/libs/mpi/test/broadcast_test.cpp 2008-06-29 11:52:25 EDT (Sun, 29 Jun 2008)
@@ -55,7 +55,6 @@
using boost::mpi::get_content;
using boost::make_counting_iterator;
using boost::mpi::broadcast;
- using boost::mpi::content;
using boost::mpi::get_content;
typedef std::list<int>::iterator iterator;
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk