ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-12 14:10:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix NGSPickle for abstract classes (like CoefficientFunction)

Browse Source
This commit is contained in:
Christopher Lackner 2018-12-21 16:03:44 +01:00
parent 829defd3eb
commit 782aa072bc
3 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/core/CMakeLists.txt
View File

@ -4,6 +4,10 @@ target_compile_definitions(ngcore PRIVATE -DNGCORE_EXPORTS)
install(TARGETS ngcore DESTINATION ${NG_INSTALL_DIR} COMPONENT netgen) install(TARGETS ngcore DESTINATION ${NG_INSTALL_DIR} COMPONENT netgen)
if(USE_PYTHON)
target_include_directories(ngcore PUBLIC ${PYTHON_INCLUDE_DIRS})
endif(USE_PYTHON)
install(FILES ngcore.hpp archive.hpp type_traits.hpp version.hpp ngcore_api.hpp install(FILES ngcore.hpp archive.hpp type_traits.hpp version.hpp ngcore_api.hpp
DESTINATION ${NG_INSTALL_DIR_INCLUDE}/core COMPONENT netgen_devel) DESTINATION ${NG_INSTALL_DIR_INCLUDE}/core COMPONENT netgen_devel)

35
libsrc/core/archive.hpp
View File

@ -806,23 +806,23 @@ namespace ngcore
}; };
#ifdef NG_PYTHON #ifdef NG_PYTHON
namespace py = pybind11;
template<typename ARCHIVE> template<typename ARCHIVE>
class PyArchive : public ARCHIVE class PyArchive : public ARCHIVE
{ {
private: private:
py::list lst; pybind11::list lst;
size_t index = 0; size_t index = 0;
using ARCHIVE::stream; using ARCHIVE::stream;
public: public:
PyArchive(const py::object& alst = py::none()) : PyArchive(const pybind11::object& alst = pybind11::none()) :
ARCHIVE(std::make_shared<std::stringstream>()), ARCHIVE(std::make_shared<std::stringstream>()),
lst(alst.is_none() ? py::list() : py::cast<py::list>(alst)) lst(alst.is_none() ? pybind11::list() : pybind11::cast<pybind11::list>(alst))
{ {
ARCHIVE::shallow_to_python = true; ARCHIVE::shallow_to_python = true;
if(Input()) if(Input())
stream = std::make_shared<std::stringstream>(py::cast<py::bytes>(lst[py::len(lst)-1])); stream = std::make_shared<std::stringstream>
(pybind11::cast<pybind11::bytes>(lst[pybind11::len(lst)-1]));
} }
using ARCHIVE::Output; using ARCHIVE::Output;
@ -831,32 +831,35 @@ namespace ngcore
using ARCHIVE::operator&; using ARCHIVE::operator&;
using ARCHIVE::operator<<; using ARCHIVE::operator<<;
using ARCHIVE::GetVersion; using ARCHIVE::GetVersion;
void ShallowOutPython(py::object val) override { lst.append(val); } void ShallowOutPython(pybind11::object val) override { lst.append(val); }
py::object ShallowInPython() override { return lst[index++]; } pybind11::object ShallowInPython() override { return lst[index++]; }
py::list WriteOut() pybind11::list WriteOut()
{ {
FlushBuffer(); FlushBuffer();
lst.append(py::bytes(std::static_pointer_cast<std::stringstream>(stream)->str())); lst.append(pybind11::bytes(std::static_pointer_cast<std::stringstream>(stream)->str()));
return lst; return lst;
} }
}; };
template<typename T, typename T_ARCHIVE_OUT=BinaryOutArchive, typename T_ARCHIVE_IN=BinaryInArchive> template<typename T, typename T_ARCHIVE_OUT=BinaryOutArchive, typename T_ARCHIVE_IN=BinaryInArchive>
auto NGSPickle() auto NGSPickle(bool printoutput=false)
{ {
return py::pickle([](T& self) return pybind11::pickle([printoutput](T* self)
{ {
PyArchive<T_ARCHIVE_OUT> ar; PyArchive<T_ARCHIVE_OUT> ar;
ar & self; ar & self;
return py::make_tuple(ar.WriteOut()); auto output = pybind11::make_tuple(ar.WriteOut());
if(printoutput)
pybind11::print("pickle output of", Demangle(typeid(T).name()),"=", output);
return output;
}, },
[](py::tuple state) [](pybind11::tuple state)
{ {
auto val = std::make_unique<T>(); T* val = nullptr;
PyArchive<T_ARCHIVE_IN> ar(state[0]); PyArchive<T_ARCHIVE_IN> ar(state[0]);
ar & *val; ar & val;
return std::move(val); return val;
}); });
} }

11
tests/catch/archive.cpp
View File

@ -236,13 +236,6 @@ void testMultipleInheritance(Archive& in, Archive& out)
} }
} }
void testLibraryVersion(Archive& in, Archive& out)
{
SetLibraryVersion("netgen","v6.2.1812");
CHECK(in.GetVersion("netgen") == "v6.2.1811");
CHECK(out.GetVersion("netgen") == "v6.2.1812");
}
void testArchive(Archive& in, Archive& out) void testArchive(Archive& in, Archive& out)
{ {
SECTION("Empty String") SECTION("Empty String")
@ -292,10 +285,6 @@ void testArchive(Archive& in, Archive& out)
{ {
testNullPtr(in, out); testNullPtr(in, out);
} }
SECTION("Library Version")
{
testLibraryVersion(in,out);
}
} }
TEST_CASE("BinaryArchive") TEST_CASE("BinaryArchive")