Rename examples files, as per #288
This renames example files from `exampleN` to `example-description`.
Specifically, the following renaming is applied:
example1 -> example-methods-and-attributes
example2 -> example-python-types
example3 -> example-operator-overloading
example4 -> example-constants-and-functions
example5 -> example-callbacks (*)
example6 -> example-sequence-and-iterators
example7 -> example-buffers
example8 -> example-custom-ref-counting
example9 -> example-modules
example10 -> example-numpy-vectorize
example11 -> example-arg-keywords-and-defaults
example12 -> example-virtual-functions
example13 -> example-keep-alive
example14 -> example-opaque-types
example15 -> example-pickling
example16 -> example-inheritance
example17 -> example-stl-binders
example18 -> example-eval
example19 -> example-custom-exceptions
* the inheritance parts of example5 are moved into example-inheritance
(previously example16), and the remainder is left as example-callbacks.
This commit also renames the internal variables ("Example1",
"Example2", "Example4", etc.) into non-numeric names ("ExampleMandA",
"ExamplePythonTypes", "ExampleWithEnum", etc.) to correspond to the
file renaming.
The order of tests is preserved, but this can easily be changed if
there is some more natural ordering by updating the list in
examples/CMakeLists.txt.
2016-07-18 20:43:18 +00:00
|
|
|
#!/usr/bin/env python
|
|
|
|
from __future__ import print_function
|
|
|
|
import sys
|
|
|
|
sys.path.append('.')
|
|
|
|
|
|
|
|
from example import ExampleVirt, runExampleVirt, runExampleVirtVirtual, runExampleVirtBool
|
2016-08-05 21:44:28 +00:00
|
|
|
from example import A_Repeat, B_Repeat, C_Repeat, D_Repeat, A_Tpl, B_Tpl, C_Tpl, D_Tpl
|
Move support for return values of called Python functions
Currently pybind11 always translates values returned by Python functions
invoked from C++ code by copying, even when moving is feasible--and,
more importantly, even when moving is required.
The first, and relatively minor, concern is that moving may be
considerably more efficient for some types. The second problem,
however, is more serious: there's currently no way python code can
return a non-copyable type to C++ code.
I ran into this while trying to add a PYBIND11_OVERLOAD of a virtual
method that returns just such a type: it simply fails to compile because
this:
overload = ...
overload(args).template cast<ret_type>();
involves a copy: overload(args) returns an object instance, and the
invoked object::cast() loads the returned value, then returns a copy of
the loaded value.
We can, however, safely move that returned value *if* the object has the
only reference to it (i.e. if ref_count() == 1) and the object is
itself temporary (i.e. if it's an rvalue).
This commit does that by adding an rvalue-qualified object::cast()
method that allows the returned value to be move-constructed out of the
stored instance when feasible.
This basically comes down to three cases:
- For objects that are movable but not copyable, we always try the move,
with a runtime exception raised if this would involve moving a value
with multiple references.
- When the type is both movable and non-trivially copyable, the move
happens only if the invoked object has a ref_count of 1, otherwise the
object is copied. (Trivially copyable types are excluded from this
case because they are typically just collections of primitive types,
which can be copied just as easily as they can be moved.)
- Non-movable and trivially copy constructible objects are simply
copied.
This also adds examples to example-virtual-functions that shows both a
non-copyable object and a movable/copyable object in action: the former
raises an exception if returned while holding a reference, the latter
invokes a move constructor if unreferenced, or a copy constructor if
referenced.
Basically this allows code such as:
class MyClass(Pybind11Class):
def somemethod(self, whatever):
mt = MovableType(whatever)
# ...
return mt
which allows the MovableType instance to be returned to the C++ code
via its move constructor.
Of course if you attempt to violate this by doing something like:
self.value = MovableType(whatever)
return self.value
you get an exception--but right now, the pybind11-side of that code
won't compile at all.
2016-07-22 01:31:05 +00:00
|
|
|
from example import NCVirt, NonCopyable, Movable
|
|
|
|
|
Rename examples files, as per #288
This renames example files from `exampleN` to `example-description`.
Specifically, the following renaming is applied:
example1 -> example-methods-and-attributes
example2 -> example-python-types
example3 -> example-operator-overloading
example4 -> example-constants-and-functions
example5 -> example-callbacks (*)
example6 -> example-sequence-and-iterators
example7 -> example-buffers
example8 -> example-custom-ref-counting
example9 -> example-modules
example10 -> example-numpy-vectorize
example11 -> example-arg-keywords-and-defaults
example12 -> example-virtual-functions
example13 -> example-keep-alive
example14 -> example-opaque-types
example15 -> example-pickling
example16 -> example-inheritance
example17 -> example-stl-binders
example18 -> example-eval
example19 -> example-custom-exceptions
* the inheritance parts of example5 are moved into example-inheritance
(previously example16), and the remainder is left as example-callbacks.
This commit also renames the internal variables ("Example1",
"Example2", "Example4", etc.) into non-numeric names ("ExampleMandA",
"ExamplePythonTypes", "ExampleWithEnum", etc.) to correspond to the
file renaming.
The order of tests is preserved, but this can easily be changed if
there is some more natural ordering by updating the list in
examples/CMakeLists.txt.
2016-07-18 20:43:18 +00:00
|
|
|
|
|
|
|
class ExtendedExampleVirt(ExampleVirt):
|
|
|
|
def __init__(self, state):
|
|
|
|
super(ExtendedExampleVirt, self).__init__(state + 1)
|
|
|
|
self.data = "Hello world"
|
|
|
|
|
|
|
|
def run(self, value):
|
|
|
|
print('ExtendedExampleVirt::run(%i), calling parent..' % value)
|
|
|
|
return super(ExtendedExampleVirt, self).run(value + 1)
|
|
|
|
|
|
|
|
def run_bool(self):
|
|
|
|
print('ExtendedExampleVirt::run_bool()')
|
|
|
|
return False
|
|
|
|
|
|
|
|
def pure_virtual(self):
|
|
|
|
print('ExtendedExampleVirt::pure_virtual(): %s' % self.data)
|
|
|
|
|
|
|
|
|
|
|
|
ex12 = ExampleVirt(10)
|
|
|
|
print(runExampleVirt(ex12, 20))
|
|
|
|
try:
|
|
|
|
runExampleVirtVirtual(ex12)
|
|
|
|
except Exception as e:
|
|
|
|
print("Caught expected exception: " + str(e))
|
|
|
|
|
|
|
|
ex12p = ExtendedExampleVirt(10)
|
|
|
|
print(runExampleVirt(ex12p, 20))
|
|
|
|
print(runExampleVirtBool(ex12p))
|
|
|
|
runExampleVirtVirtual(ex12p)
|
2016-08-05 21:02:33 +00:00
|
|
|
|
|
|
|
class VI_AR(A_Repeat):
|
|
|
|
def unlucky_number(self):
|
|
|
|
return 99
|
|
|
|
class VI_AT(A_Tpl):
|
|
|
|
def unlucky_number(self):
|
|
|
|
return 999
|
|
|
|
|
|
|
|
class VI_CR(C_Repeat):
|
|
|
|
def lucky_number(self):
|
|
|
|
return C_Repeat.lucky_number(self) + 1.25
|
|
|
|
class VI_CT(C_Tpl):
|
|
|
|
pass
|
|
|
|
class VI_CCR(VI_CR):
|
|
|
|
def lucky_number(self):
|
|
|
|
return VI_CR.lucky_number(self) * 10
|
|
|
|
class VI_CCT(VI_CT):
|
|
|
|
def lucky_number(self):
|
|
|
|
return VI_CT.lucky_number(self) * 1000
|
|
|
|
|
|
|
|
|
|
|
|
class VI_DR(D_Repeat):
|
|
|
|
def unlucky_number(self):
|
|
|
|
return 123
|
|
|
|
def lucky_number(self):
|
|
|
|
return 42.0
|
|
|
|
class VI_DT(D_Tpl):
|
|
|
|
def say_something(self, times):
|
|
|
|
print("VI_DT says:" + (' quack' * times))
|
|
|
|
def unlucky_number(self):
|
|
|
|
return 1234
|
|
|
|
def lucky_number(self):
|
|
|
|
return -4.25
|
|
|
|
|
|
|
|
classes = [
|
2016-08-05 21:44:28 +00:00
|
|
|
# A_Repeat, A_Tpl, # abstract (they have a pure virtual unlucky_number)
|
|
|
|
VI_AR, VI_AT,
|
|
|
|
B_Repeat, B_Tpl,
|
|
|
|
C_Repeat, C_Tpl,
|
|
|
|
VI_CR, VI_CT, VI_CCR, VI_CCT,
|
|
|
|
D_Repeat, D_Tpl, VI_DR, VI_DT
|
2016-08-05 21:02:33 +00:00
|
|
|
]
|
|
|
|
|
|
|
|
for cl in classes:
|
|
|
|
print("\n%s:" % cl.__name__)
|
|
|
|
obj = cl()
|
|
|
|
obj.say_something(3)
|
|
|
|
print("Unlucky = %d" % obj.unlucky_number())
|
|
|
|
if hasattr(obj, "lucky_number"):
|
|
|
|
print("Lucky = %.2f" % obj.lucky_number())
|
|
|
|
|
Move support for return values of called Python functions
Currently pybind11 always translates values returned by Python functions
invoked from C++ code by copying, even when moving is feasible--and,
more importantly, even when moving is required.
The first, and relatively minor, concern is that moving may be
considerably more efficient for some types. The second problem,
however, is more serious: there's currently no way python code can
return a non-copyable type to C++ code.
I ran into this while trying to add a PYBIND11_OVERLOAD of a virtual
method that returns just such a type: it simply fails to compile because
this:
overload = ...
overload(args).template cast<ret_type>();
involves a copy: overload(args) returns an object instance, and the
invoked object::cast() loads the returned value, then returns a copy of
the loaded value.
We can, however, safely move that returned value *if* the object has the
only reference to it (i.e. if ref_count() == 1) and the object is
itself temporary (i.e. if it's an rvalue).
This commit does that by adding an rvalue-qualified object::cast()
method that allows the returned value to be move-constructed out of the
stored instance when feasible.
This basically comes down to three cases:
- For objects that are movable but not copyable, we always try the move,
with a runtime exception raised if this would involve moving a value
with multiple references.
- When the type is both movable and non-trivially copyable, the move
happens only if the invoked object has a ref_count of 1, otherwise the
object is copied. (Trivially copyable types are excluded from this
case because they are typically just collections of primitive types,
which can be copied just as easily as they can be moved.)
- Non-movable and trivially copy constructible objects are simply
copied.
This also adds examples to example-virtual-functions that shows both a
non-copyable object and a movable/copyable object in action: the former
raises an exception if returned while holding a reference, the latter
invokes a move constructor if unreferenced, or a copy constructor if
referenced.
Basically this allows code such as:
class MyClass(Pybind11Class):
def somemethod(self, whatever):
mt = MovableType(whatever)
# ...
return mt
which allows the MovableType instance to be returned to the C++ code
via its move constructor.
Of course if you attempt to violate this by doing something like:
self.value = MovableType(whatever)
return self.value
you get an exception--but right now, the pybind11-side of that code
won't compile at all.
2016-07-22 01:31:05 +00:00
|
|
|
class NCVirtExt(NCVirt):
|
|
|
|
def get_noncopyable(self, a, b):
|
|
|
|
# Constructs and returns a new instance:
|
|
|
|
nc = NonCopyable(a*a, b*b)
|
|
|
|
return nc
|
|
|
|
def get_movable(self, a, b):
|
|
|
|
# Return a referenced copy
|
|
|
|
self.movable = Movable(a, b)
|
|
|
|
return self.movable
|
|
|
|
|
|
|
|
class NCVirtExt2(NCVirt):
|
|
|
|
def get_noncopyable(self, a, b):
|
|
|
|
# Keep a reference: this is going to throw an exception
|
|
|
|
self.nc = NonCopyable(a, b)
|
|
|
|
return self.nc
|
|
|
|
def get_movable(self, a, b):
|
|
|
|
# Return a new instance without storing it
|
|
|
|
return Movable(a, b)
|
|
|
|
|
|
|
|
ncv1 = NCVirtExt()
|
|
|
|
print("2^2 * 3^2 =")
|
|
|
|
ncv1.print_nc(2, 3)
|
|
|
|
print("4 + 5 =")
|
|
|
|
ncv1.print_movable(4, 5)
|
|
|
|
ncv2 = NCVirtExt2()
|
|
|
|
print("7 + 7 =")
|
|
|
|
ncv2.print_movable(7, 7)
|
|
|
|
try:
|
|
|
|
ncv2.print_nc(9, 9)
|
|
|
|
print("Something's wrong: exception not raised!")
|
|
|
|
except RuntimeError as e:
|
|
|
|
# Don't print the exception message here because it differs under debug/non-debug mode
|
|
|
|
print("Caught expected exception")
|
Improve constructor/destructor tracking
This commit rewrites the examples that look for constructor/destructor
calls to do so via static variable tracking rather than output parsing.
The added ConstructorStats class provides methods to keep track of
constructors and destructors, number of default/copy/move constructors,
and number of copy/move assignments. It also provides a mechanism for
storing values (e.g. for value construction), and then allows all of
this to be checked at the end of a test by getting the statistics for a
C++ (or python mapping) class.
By not relying on the precise pattern of constructions/destructions,
but rather simply ensuring that every construction is matched with a
destruction on the same object, we ensure that everything that gets
created also gets destroyed as expected.
This replaces all of the various "std::cout << whatever" code in
constructors/destructors with
`print_created(this)`/`print_destroyed(this)`/etc. functions which
provide similar output, but now has a unified format across the
different examples, including a new ### prefix that makes mixed example
output and lifecycle events easier to distinguish.
With this change, relaxed mode is no longer needed, which enables
testing for proper destruction under MSVC, and under any other compiler
that generates code calling extra constructors, or optimizes away any
constructors. GCC/clang are used as the baseline for move
constructors; the tests are adapted to allow more move constructors to
be evoked (but other types are constructors much have matching counts).
This commit also disables output buffering of tests, as the buffering
sometimes results in C++ output ending up in the middle of python
output (or vice versa), depending on the OS/python version.
2016-08-07 17:05:26 +00:00
|
|
|
|
|
|
|
from example import ConstructorStats
|
|
|
|
del ex12
|
|
|
|
del ex12p
|
|
|
|
del obj
|
|
|
|
del ncv1
|
|
|
|
del ncv2
|
|
|
|
cstats = [ConstructorStats.get(ExampleVirt), ConstructorStats.get(NonCopyable), ConstructorStats.get(Movable)]
|
|
|
|
print("Instances not destroyed:", [x.alive() for x in cstats])
|
|
|
|
print("Constructor values:", [x.values() for x in cstats])
|
|
|
|
print("Copy constructions:", [x.copy_constructions for x in cstats])
|
|
|
|
print("Move constructions:", [cstats[i].move_constructions >= 1 for i in range(1, len(cstats))])
|
|
|
|
|