Skip to content

Commit

Permalink
Merge pull request #19 from pfernique/master
Browse files Browse the repository at this point in the history
Move wrappers
  • Loading branch information
pfernique committed May 16, 2017
2 parents 70cd7a0 + cffb5c8 commit 55f6358
Show file tree
Hide file tree
Showing 28 changed files with 269 additions and 29 deletions.
2 changes: 1 addition & 1 deletion SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ VariantDir(os.path.join('build', 'src'), 'src')
VariantDir(os.path.join('build', 'test'), 'test')

SConscript(os.path.join('build', 'src', 'cpp', 'SConscript'), exports="env")
SConscript(os.path.join('build', 'src', 'py', 'SConscript'), exports="env")
SConscript(os.path.join('build', 'src', 'py', 'wrapper', 'SConscript'), exports="env")
SConscript(os.path.join('build', 'test', 'SConscript'), exports="env")
SConscript(os.path.join('conda', 'SConscript'), exports="env")

Expand Down
24 changes: 17 additions & 7 deletions src/cpp/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -140,33 +140,43 @@ try:
cppenv = env.Clone(tools = ['cpp'])

cppenv.AppendUnique(CPPDEFINES = ['LIBSTATISKIT_STL'])

exclude = """
""".split()

sources = [source for source in cppenv.Glob('*.*') if not source.name in exclude]

targets = cppenv.CppLibrary("statiskit_stl", sources)
sources = [source for source in cppenv.Glob('*.h*') if not source.name in exclude]
targets = cppenv.CppDev("statiskit_stl", sources)
Alias("cpp-dev", targets)
Alias("cpp", targets)
Alias("autowig", targets)
Alias("install", targets)
try:
wigenv = cppenv.Clone(tools = ['wig'])

targets = wigenv.BoostPythonWIG('statiskit_stl', [target for target in targets if target.name.endswith('.h')],
module='../py/_stl.cpp',
module='../py/wrapper/_stl.cpp',
decorator='../py/statiskit/stl/_stl.py',
parser_bootstrap=1,
controller='AutoWIG.py',
generator='AutoWIG.py')
depends=[])
Alias("autowig", targets)
wigenv.Depends(targets, "cpp")
wigenv.Depends(targets, "cpp-dev")
except EnvironmentError:
Alias("autowig", [])
pass
except Exception:
raise

exclude = """
""".split()

sources = [source for source in cppenv.Glob('*.cpp') if not source.name in exclude]
targets = cppenv.CppLib("statiskit_stl", sources)
Alias("cpp-lib", targets)
Alias("cpp", targets)
Alias("install", targets)
except EnvironmentError:
Alias("cpp-dev", [])
Alias("cpp-lib", [])
Alias("cpp", [])
Alias("autowig", [])
Alias("install", [])
Expand Down
14 changes: 12 additions & 2 deletions src/py/statiskit/stl/_stl.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,24 @@


# Group template specializations
__stl.std._EqualTo = (__stl.std._EqualTo_d0ba0922f2505f7b8e291326cad79af5)
__stl.std._Set = (__stl.std._Set_476c1c1f206251dba7af53c48f3f6e42, __stl.std._Set_6436891c9b6854f494789a812891cbe5, __stl.std._Set_858bbf0613575e2ebe4b0e5902107ad6, __stl.std._Set_882a8dd1e64a51b4a9da29ab852a852e)
__stl.std._Fpos = (__stl.std._Fpos_c62bcafb31b250e8bb3f63626536f4b4)
__stl.statiskit.stl._Generator = (__stl.statiskit.stl._Generator_10b14312eeb655268489cd34090870cf, __stl.statiskit.stl._Generator_3b59a0980c80518c808634f7a84dc3cd, __stl.statiskit.stl._Generator_745e4933f5b250d9bc5232fe864d0cf7, __stl.statiskit.stl._Generator_74bc331707c1505eb2f807cae7c32bbb, __stl.statiskit.stl._Generator_e76a1308464d5a9a837d9a61f942fae7)
__stl.std._BinaryFunction = (__stl.std._BinaryFunction_8f249c2863945cb59771b97c53bdafec)
__stl.std._BasicString = (__stl.std._BasicString_448c20257e485acda59dc59305fceb58)
__stl.std._Vector = (__stl.std._Vector_107131f9768c56e794a9b0de728d1738, __stl.std._Vector_6b9ae5eac40858c9a0f5e6e21c15d1d3, __stl.std._Vector_c047f2c3135554ceb57f166fd404cfc8, __stl.std._Vector_dc5522842bc75d8b9ac7b46020c60854)
__stl.std._CharTraits = (__stl.std._CharTraits_277a0516fe4451448165550d8b9d6b2b)
__stl.std._Hash = (__stl.std._Hash_75afda0914ae509eb2ac219b3af0a0ff)
__stl.std._UnorderedSet = (__stl.std._UnorderedSet_d48105936d4f5d09a78d2aa9f878fdb8)
__stl.std._Set = (__stl.std._Set_476c1c1f206251dba7af53c48f3f6e42, __stl.std._Set_6436891c9b6854f494789a812891cbe5, __stl.std._Set_858bbf0613575e2ebe4b0e5902107ad6, __stl.std._Set_882a8dd1e64a51b4a9da29ab852a852e)
__stl.std._Vector = (__stl.std._Vector_107131f9768c56e794a9b0de728d1738, __stl.std._Vector_6b9ae5eac40858c9a0f5e6e21c15d1d3, __stl.std._Vector_c047f2c3135554ceb57f166fd404cfc8, __stl.std._Vector_dc5522842bc75d8b9ac7b46020c60854)

# Define aliases
__stl.std._CharTraits_277a0516fe4451448165550d8b9d6b2b.PosType = __stl.std._Fpos_c62bcafb31b250e8bb3f63626536f4b4
__stl.std._BasicString_448c20257e485acda59dc59305fceb58.TraitsType = __stl.std._CharTraits_277a0516fe4451448165550d8b9d6b2b
__stl.std._Set_6436891c9b6854f494789a812891cbe5.KeyType = __stl.std._BasicString_448c20257e485acda59dc59305fceb58
__stl.std._Set_6436891c9b6854f494789a812891cbe5.ValueType = __stl.std._BasicString_448c20257e485acda59dc59305fceb58
__stl.std._UnorderedSet_d48105936d4f5d09a78d2aa9f878fdb8.Hasher = __stl.std._Hash_75afda0914ae509eb2ac219b3af0a0ff
__stl.std._UnorderedSet_d48105936d4f5d09a78d2aa9f878fdb8.KeyEqual = __stl.std._EqualTo_d0ba0922f2505f7b8e291326cad79af5
__stl.statiskit.stl.VectorInt = __stl.std._Vector_6b9ae5eac40858c9a0f5e6e21c15d1d3
__stl.statiskit.stl.VectorDouble = __stl.std._Vector_107131f9768c56e794a9b0de728d1738
__stl.statiskit.stl.SetLessDoubleGenerator = __stl.statiskit.stl._Generator_74bc331707c1505eb2f807cae7c32bbb
Expand All @@ -30,4 +39,5 @@
__stl.statiskit.stl.SetLessIntGenerator = __stl.statiskit.stl._Generator_e76a1308464d5a9a837d9a61f942fae7
__stl.statiskit.stl.SetLessStringGenerator = __stl.statiskit.stl._Generator_745e4933f5b250d9bc5232fe864d0cf7
__stl.statiskit.stl.SetIndexGenerator = __stl.statiskit.stl._Generator_3b59a0980c80518c808634f7a84dc3cd
__stl.statiskit.Indices = __stl.std._Set_476c1c1f206251dba7af53c48f3f6e42
__stl.std._Vector_c047f2c3135554ceb57f166fd404cfc8.ValueType = __stl.std._BasicString_448c20257e485acda59dc59305fceb58
4 changes: 2 additions & 2 deletions src/py/SConscript → src/py/wrapper/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ try:

sources = [source for source in pyenv.Glob('*.*') if source.name not in exclude]

targets = pyenv.BoostPythonExtension("statiskit/stl/__stl", sources)
targets = pyenv.BoostPythonExtension("../statiskit/stl/__stl", sources)
Alias("py", targets)
Alias("install", targets)
pyenv.Depends(targets, "cpp")

targets = pyenv.PythonPackage('statiskit')
targets = pyenv.PythonPackage(statiskit='../statiskit')
Alias("py", targets)
Alias("install", targets)
pyenv.Depends(targets, "cpp")
Expand Down
12 changes: 12 additions & 0 deletions src/py/_stl.cpp → src/py/wrapper/_stl.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "_stl.h"

void wrapper_10b14312eeb655268489cd34090870cf();
void wrapper_277a0516fe4451448165550d8b9d6b2b();
void wrapper_3b59a0980c80518c808634f7a84dc3cd();
void wrapper_448c20257e485acda59dc59305fceb58();
void wrapper_476c1c1f206251dba7af53c48f3f6e42();
Expand All @@ -9,19 +10,25 @@ void wrapper_745e4933f5b250d9bc5232fe864d0cf7();
void wrapper_74bc331707c1505eb2f807cae7c32bbb();
void wrapper_858bbf0613575e2ebe4b0e5902107ad6();
void wrapper_882a8dd1e64a51b4a9da29ab852a852e();
void wrapper_8f249c2863945cb59771b97c53bdafec();
void wrapper_c62bcafb31b250e8bb3f63626536f4b4();
void wrapper_d48105936d4f5d09a78d2aa9f878fdb8();
void wrapper_e76a1308464d5a9a837d9a61f942fae7();
void wrapper_f1ab29faa1815285a06ca52391d1425f();
void wrapper_fa414b05d29e5f4ea0b6d6cb5cf81b01();
void wrapper_107131f9768c56e794a9b0de728d1738();
void wrapper_6b9ae5eac40858c9a0f5e6e21c15d1d3();
void wrapper_75afda0914ae509eb2ac219b3af0a0ff();
void wrapper_c047f2c3135554ceb57f166fd404cfc8();
void wrapper_d0ba0922f2505f7b8e291326cad79af5();
void wrapper_dc5522842bc75d8b9ac7b46020c60854();

boost::python::docstring_options docstring_options(1, 0, 0);

BOOST_PYTHON_MODULE(__stl)
{
wrapper_10b14312eeb655268489cd34090870cf();
wrapper_277a0516fe4451448165550d8b9d6b2b();
wrapper_3b59a0980c80518c808634f7a84dc3cd();
wrapper_448c20257e485acda59dc59305fceb58();
wrapper_476c1c1f206251dba7af53c48f3f6e42();
Expand All @@ -30,11 +37,16 @@ BOOST_PYTHON_MODULE(__stl)
wrapper_74bc331707c1505eb2f807cae7c32bbb();
wrapper_858bbf0613575e2ebe4b0e5902107ad6();
wrapper_882a8dd1e64a51b4a9da29ab852a852e();
wrapper_8f249c2863945cb59771b97c53bdafec();
wrapper_c62bcafb31b250e8bb3f63626536f4b4();
wrapper_d48105936d4f5d09a78d2aa9f878fdb8();
wrapper_e76a1308464d5a9a837d9a61f942fae7();
wrapper_f1ab29faa1815285a06ca52391d1425f();
wrapper_fa414b05d29e5f4ea0b6d6cb5cf81b01();
wrapper_107131f9768c56e794a9b0de728d1738();
wrapper_6b9ae5eac40858c9a0f5e6e21c15d1d3();
wrapper_75afda0914ae509eb2ac219b3af0a0ff();
wrapper_c047f2c3135554ceb57f166fd404cfc8();
wrapper_d0ba0922f2505f7b8e291326cad79af5();
wrapper_dc5522842bc75d8b9ac7b46020c60854();
}
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
namespace autowig
{

void method_decorator_beaa574a87dd59068311360e573c777c(class ::std::vector< double, class ::std::allocator< double > > & instance, ::std::vector< double, class ::std::allocator< double > >::size_type param_in_0, const ::std::vector< double, class ::std::allocator< double > >::reference param_out) { instance.at(param_in_0) = param_out; }
void method_decorator_22f52ccf4b785404ada1e9bcb9fa01aa(class ::std::vector< double, class ::std::allocator< double > > & instance, const ::std::vector< double, class ::std::allocator< double > >::reference param_out) { instance.front() = param_out; }
void method_decorator_cae6ded0197f5723954a48c02008c60c(class ::std::vector< double, class ::std::allocator< double > > & instance, const ::std::vector< double, class ::std::allocator< double > >::reference param_out) { instance.back() = param_out; }
void method_decorator_beaa574a87dd59068311360e573c777c(class ::std::vector< double, class ::std::allocator< double > > & instance, ::std::vector< double, class ::std::allocator< double > >::size_type param_in_0, double param_out) { instance.at(param_in_0) = param_out; }
void method_decorator_22f52ccf4b785404ada1e9bcb9fa01aa(class ::std::vector< double, class ::std::allocator< double > > & instance, double param_out) { instance.front() = param_out; }
void method_decorator_cae6ded0197f5723954a48c02008c60c(class ::std::vector< double, class ::std::allocator< double > > & instance, double param_out) { instance.back() = param_out; }
}

#if defined(_MSC_VER)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace autowig
{

void method_decorator_9ee3d1b710825c39bad8dfdf4db13de4(class ::statiskit::stl::Generator< class ::std::set< unsigned long int, struct ::std::less< unsigned long int >, class ::std::allocator< unsigned long int > > > & instance, class ::statiskit::stl::Generator< class ::std::set< unsigned long int, struct ::std::less< unsigned long int >, class ::std::allocator< unsigned long int > > > & param_out) { instance.operator++() = param_out; }
void method_decorator_9ee3d1b710825c39bad8dfdf4db13de4(class ::statiskit::stl::Generator< class ::std::set< unsigned long int, struct ::std::less< unsigned long int >, class ::std::allocator< unsigned long int > > > & instance, const class ::statiskit::stl::Generator< class ::std::set< unsigned long int, struct ::std::less< unsigned long int >, class ::std::allocator< unsigned long int > > > & param_out) { instance.operator++() = param_out; }
}

#if defined(_MSC_VER)
Expand Down
54 changes: 54 additions & 0 deletions src/py/wrapper/wrapper_277a0516fe4451448165550d8b9d6b2b.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
#include "_stl.h"



namespace autowig
{

}

#if defined(_MSC_VER)
#if (_MSC_VER == 1900)
namespace boost
{
template <> struct ::std::char_traits< char > const volatile * get_pointer<struct ::std::char_traits< char > const volatile >(struct ::std::char_traits< char > const volatile *c) { return c; }
}
#endif
#endif



void wrapper_277a0516fe4451448165550d8b9d6b2b()
{

std::string name_a5e4e9231d6351ccb0e06756b389f0af = boost::python::extract< std::string >(boost::python::scope().attr("__name__") + ".std");
boost::python::object module_a5e4e9231d6351ccb0e06756b389f0af(boost::python::handle< >(boost::python::borrowed(PyImport_AddModule(name_a5e4e9231d6351ccb0e06756b389f0af.c_str()))));
boost::python::scope().attr("std") = module_a5e4e9231d6351ccb0e06756b389f0af;
boost::python::scope scope_a5e4e9231d6351ccb0e06756b389f0af = module_a5e4e9231d6351ccb0e06756b389f0af;
void (*method_pointer_e76c133b786152b8bcf5d577c8cf59e0)(::std::char_traits< char >::char_type &, ::std::char_traits< char >::char_type const &) = ::std::char_traits< char >::assign;
bool (*method_pointer_13ff000e892f5803b159660b8ca8e446)(::std::char_traits< char >::char_type const &, ::std::char_traits< char >::char_type const &) = ::std::char_traits< char >::eq;
bool (*method_pointer_68da674b9adc5b81862624674da75a12)(::std::char_traits< char >::char_type const &, ::std::char_traits< char >::char_type const &) = ::std::char_traits< char >::lt;
::std::char_traits< char >::char_type (*method_pointer_12d856e62be0598da943a4031b8c7d0a)(::std::char_traits< char >::int_type const &) = ::std::char_traits< char >::to_char_type;
::std::char_traits< char >::int_type (*method_pointer_863af32f10485e3793a4327ab4dc03c7)(::std::char_traits< char >::char_type const &) = ::std::char_traits< char >::to_int_type;
bool (*method_pointer_958820696dae5876b19e238cec2e0040)(::std::char_traits< char >::int_type const &, ::std::char_traits< char >::int_type const &) = ::std::char_traits< char >::eq_int_type;
::std::char_traits< char >::int_type (*method_pointer_8e0245c906515b8bac9b3a032c10c3ec)() = ::std::char_traits< char >::eof;
::std::char_traits< char >::int_type (*method_pointer_5efa6ea3d7425d318a1f00b954dd4b73)(::std::char_traits< char >::int_type const &) = ::std::char_traits< char >::not_eof;
boost::python::class_< struct ::std::char_traits< char >, autowig::Held< struct ::std::char_traits< char > >::Type > class_277a0516fe4451448165550d8b9d6b2b("_CharTraits_277a0516fe4451448165550d8b9d6b2b", "", boost::python::no_init);
class_277a0516fe4451448165550d8b9d6b2b.def("assign", method_pointer_e76c133b786152b8bcf5d577c8cf59e0, "");
class_277a0516fe4451448165550d8b9d6b2b.def("eq", method_pointer_13ff000e892f5803b159660b8ca8e446, "");
class_277a0516fe4451448165550d8b9d6b2b.def("lt", method_pointer_68da674b9adc5b81862624674da75a12, "");
class_277a0516fe4451448165550d8b9d6b2b.def("to_char_type", method_pointer_12d856e62be0598da943a4031b8c7d0a, "");
class_277a0516fe4451448165550d8b9d6b2b.def("to_int_type", method_pointer_863af32f10485e3793a4327ab4dc03c7, "");
class_277a0516fe4451448165550d8b9d6b2b.def("eq_int_type", method_pointer_958820696dae5876b19e238cec2e0040, "");
class_277a0516fe4451448165550d8b9d6b2b.def("eof", method_pointer_8e0245c906515b8bac9b3a032c10c3ec, "");
class_277a0516fe4451448165550d8b9d6b2b.def("not_eof", method_pointer_5efa6ea3d7425d318a1f00b954dd4b73, "");
class_277a0516fe4451448165550d8b9d6b2b.staticmethod("eof");
class_277a0516fe4451448165550d8b9d6b2b.staticmethod("to_int_type");
class_277a0516fe4451448165550d8b9d6b2b.staticmethod("not_eof");
class_277a0516fe4451448165550d8b9d6b2b.staticmethod("eq_int_type");
class_277a0516fe4451448165550d8b9d6b2b.staticmethod("to_char_type");
class_277a0516fe4451448165550d8b9d6b2b.staticmethod("lt");
class_277a0516fe4451448165550d8b9d6b2b.staticmethod("eq");
class_277a0516fe4451448165550d8b9d6b2b.staticmethod("assign");

}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace autowig
{

void method_decorator_03b285991d1f51b1a7d55a3416478017(class ::statiskit::stl::Generator< class ::std::unordered_set< unsigned long int, struct ::std::hash< unsigned long int >, struct ::std::equal_to< unsigned long int >, class ::std::allocator< unsigned long int > > > & instance, class ::statiskit::stl::Generator< class ::std::unordered_set< unsigned long int, struct ::std::hash< unsigned long int >, struct ::std::equal_to< unsigned long int >, class ::std::allocator< unsigned long int > > > & param_out) { instance.operator++() = param_out; }
void method_decorator_03b285991d1f51b1a7d55a3416478017(class ::statiskit::stl::Generator< class ::std::unordered_set< unsigned long int, struct ::std::hash< unsigned long int >, struct ::std::equal_to< unsigned long int >, class ::std::allocator< unsigned long int > > > & instance, const class ::statiskit::stl::Generator< class ::std::unordered_set< unsigned long int, struct ::std::hash< unsigned long int >, struct ::std::equal_to< unsigned long int >, class ::std::allocator< unsigned long int > > > & param_out) { instance.operator++() = param_out; }
}

#if defined(_MSC_VER)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
namespace autowig
{

void method_decorator_bb1e0852f2ca56c094260a03787426c7(class ::std::vector< int, class ::std::allocator< int > > & instance, ::std::vector< int, class ::std::allocator< int > >::size_type param_in_0, const ::std::vector< int, class ::std::allocator< int > >::reference param_out) { instance.at(param_in_0) = param_out; }
void method_decorator_7ec1ac72b0b05f3a9707175bcd5da0bd(class ::std::vector< int, class ::std::allocator< int > > & instance, const ::std::vector< int, class ::std::allocator< int > >::reference param_out) { instance.front() = param_out; }
void method_decorator_ed1cf37568ed54cbbd326e6ccbe5f27d(class ::std::vector< int, class ::std::allocator< int > > & instance, const ::std::vector< int, class ::std::allocator< int > >::reference param_out) { instance.back() = param_out; }
void method_decorator_bb1e0852f2ca56c094260a03787426c7(class ::std::vector< int, class ::std::allocator< int > > & instance, ::std::vector< int, class ::std::allocator< int > >::size_type param_in_0, int param_out) { instance.at(param_in_0) = param_out; }
void method_decorator_7ec1ac72b0b05f3a9707175bcd5da0bd(class ::std::vector< int, class ::std::allocator< int > > & instance, int param_out) { instance.front() = param_out; }
void method_decorator_ed1cf37568ed54cbbd326e6ccbe5f27d(class ::std::vector< int, class ::std::allocator< int > > & instance, int param_out) { instance.back() = param_out; }
}

#if defined(_MSC_VER)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace autowig
{

void method_decorator_a7cb81625e2f579199aeaaecca69d69f(class ::statiskit::stl::Generator< class ::std::set< class ::std::basic_string< char, struct ::std::char_traits< char >, class ::std::allocator< char > >, struct ::std::less< class ::std::basic_string< char, struct ::std::char_traits< char >, class ::std::allocator< char > > >, class ::std::allocator< class ::std::basic_string< char, struct ::std::char_traits< char >, class ::std::allocator< char > > > > > & instance, class ::statiskit::stl::Generator< class ::std::set< class ::std::basic_string< char, struct ::std::char_traits< char >, class ::std::allocator< char > >, struct ::std::less< class ::std::basic_string< char, struct ::std::char_traits< char >, class ::std::allocator< char > > >, class ::std::allocator< class ::std::basic_string< char, struct ::std::char_traits< char >, class ::std::allocator< char > > > > > & param_out) { instance.operator++() = param_out; }
void method_decorator_a7cb81625e2f579199aeaaecca69d69f(class ::statiskit::stl::Generator< class ::std::set< class ::std::basic_string< char, struct ::std::char_traits< char >, class ::std::allocator< char > >, struct ::std::less< class ::std::basic_string< char, struct ::std::char_traits< char >, class ::std::allocator< char > > >, class ::std::allocator< class ::std::basic_string< char, struct ::std::char_traits< char >, class ::std::allocator< char > > > > > & instance, const class ::statiskit::stl::Generator< class ::std::set< class ::std::basic_string< char, struct ::std::char_traits< char >, class ::std::allocator< char > >, struct ::std::less< class ::std::basic_string< char, struct ::std::char_traits< char >, class ::std::allocator< char > > >, class ::std::allocator< class ::std::basic_string< char, struct ::std::char_traits< char >, class ::std::allocator< char > > > > > & param_out) { instance.operator++() = param_out; }
}

#if defined(_MSC_VER)
Expand Down

0 comments on commit 55f6358

Please sign in to comment.