Please find below an update for cad/netgen-mesher to version 6.2.2604. Changelog: https://github.com/NGSolve/netgen/compare/v6.2.2602...v6.2.2604 Notes about this update: 1. 100% tests passed, 0 tests failed out of 8 2. Build tested consumer cad/freecad diff /usr/ports path + /usr/ports commit - eb30e0faeb80c015baad32d43e2ce92ffafb483c blob - 45f93c13b25094a9f6af4c1c0262950ed65fc0e4 file + cad/netgen-mesher/Makefile --- cad/netgen-mesher/Makefile +++ cad/netgen-mesher/Makefile @@ -1,6 +1,6 @@ COMMENT = automatic 3d tetrahedral mesh generator -V = 6.2.2602 +V = 6.2.2604 PKGNAME = netgen-mesher-${V} GH_ACCOUNT = NGSolve @@ -8,7 +8,7 @@ GH_PROJECT = netgen GH_TAGNAME = v${V} # git checkout v${V}; git describe --tags --match "v[0-9]*" --long --dirty -NETGEN_VERSION_GIT = v6.2.2602-0-g9f916098 +NETGEN_VERSION_GIT = v6.2.2604-0-g3ee489c7 CATEGORIES = cad HOMEPAGE = https://ngsolve.org/ commit - eb30e0faeb80c015baad32d43e2ce92ffafb483c blob - fabd3214fa33d3d5de9dcf9c5fa5453e9827e38a file + cad/netgen-mesher/distinfo --- cad/netgen-mesher/distinfo +++ cad/netgen-mesher/distinfo @@ -1,2 +1,2 @@ -SHA256 (netgen-6.2.2602.tar.gz) = 1U3ewpzowuQ8fxJcmnfySf3wyIAMOQ2NJJmgFl5K0vM= -SIZE (netgen-6.2.2602.tar.gz) = 3344800 +SHA256 (netgen-6.2.2604.tar.gz) = CmFBk+5hBsDCdqFRZjm++HLy8jcd7BWeGx9v/LQllUw= +SIZE (netgen-6.2.2604.tar.gz) = 3308713 commit - eb30e0faeb80c015baad32d43e2ce92ffafb483c blob - 780ab396c79cd36c3164edd7ba4b561ec909edb6 file + cad/netgen-mesher/patches/patch-libsrc_core_CMakeLists_txt --- cad/netgen-mesher/patches/patch-libsrc_core_CMakeLists_txt +++ cad/netgen-mesher/patches/patch-libsrc_core_CMakeLists_txt @@ -1,7 +1,7 @@ Index: libsrc/core/CMakeLists.txt --- libsrc/core/CMakeLists.txt.orig +++ libsrc/core/CMakeLists.txt -@@ -58,8 +58,6 @@ if(WIN32) +@@ -59,8 +59,6 @@ if(WIN32) get_WIN32_WINNT(ver) target_compile_definitions(ngcore PUBLIC _WIN32_WINNT=${ver} WNT WNT_WINDOW NOMINMAX MSVC_EXPRESS _CRT_SECURE_NO_WARNINGS HAVE_STRUCT_TIMESPEC WIN32) target_link_options(ngcore PUBLIC /ignore:4273 /ignore:4217 /ignore:4049) @@ -10,7 +10,7 @@ Index: libsrc/core/CMakeLists.txt endif(WIN32) target_compile_definitions(ngcore PRIVATE NGCORE_EXPORTS) -@@ -85,7 +83,8 @@ endif(USE_NUMA) +@@ -86,7 +84,8 @@ endif(USE_NUMA) install(TARGETS ngcore DESTINATION ${NG_INSTALL_DIR} COMPONENT netgen) commit - eb30e0faeb80c015baad32d43e2ce92ffafb483c blob - /dev/null file + cad/netgen-mesher/patches/patch-libsrc_core_python_ngcore_hpp (mode 644) --- /dev/null +++ cad/netgen-mesher/patches/patch-libsrc_core_python_ngcore_hpp @@ -0,0 +1,13 @@ +https://github.com/NGSolve/netgen/pull/221 + +Index: libsrc/core/python_ngcore.hpp +--- libsrc/core/python_ngcore.hpp.orig ++++ libsrc/core/python_ngcore.hpp +@@ -2,6 +2,7 @@ + #define NETGEN_CORE_PYTHON_NGCORE_HPP + + #include "ngcore_api.hpp" // for operator new ++#include <pybind11/embed.h> + #include <pybind11/pybind11.h> + #include <pybind11/operators.h> + #include <pybind11/numpy.h> commit - eb30e0faeb80c015baad32d43e2ce92ffafb483c blob - c97231df3f5dea6b3150156e250249402eed4a81 file + /dev/null --- cad/netgen-mesher/patches/patch-libsrc_meshing_python_mesh_cpp +++ /dev/null @@ -1,26 +0,0 @@ -This patch has been merged upstream. Drop next update. -Commit: ceacae3844ed2f0c48c8b6a3a82904b16c594f41 - -Index: libsrc/meshing/python_mesh.cpp ---- libsrc/meshing/python_mesh.cpp.orig -+++ libsrc/meshing/python_mesh.cpp -@@ -970,15 +970,12 @@ DLL_HEADER void ExportNetgenMeshing(py::module &m) - { sizeof(self.Points()[PointIndex::BASE]), sizeof(double) } ) - ); - }) -- .def_property_readonly("parentelements", [](Mesh & self) { -- // return FlatArray<int>(self.mlparentelement.Size(), &self.mlparentelement[0]); -+ .def_property_readonly("parentelements", py::cpp_function([](Mesh & self) { - return FlatArray(self.mlparentelement); -- }, py::keep_alive<0,1>()) -- .def_property_readonly("parentsurfaceelements", [](Mesh & self) { -- // return FlatArray<int>(self.mlparentsurfaceelement.Size(), -- // &self.mlparentsurfaceelement[0]); -+ }, py::keep_alive<0,1>())) -+ .def_property_readonly("parentsurfaceelements", py::cpp_function([](Mesh & self) { - return FlatArray(self.mlparentsurfaceelement); -- }, py::keep_alive<0,1>()) -+ }, py::keep_alive<0,1>())) - .def_property_readonly("macromesh", [](Mesh & self) { - auto coarsemesh = make_shared<Mesh>(); - *coarsemesh = *self.coarsemesh; commit - eb30e0faeb80c015baad32d43e2ce92ffafb483c blob - /dev/null file + cad/netgen-mesher/patches/patch-ng_ngappinit_cpp (mode 644) --- /dev/null +++ cad/netgen-mesher/patches/patch-ng_ngappinit_cpp @@ -0,0 +1,13 @@ +https://github.com/NGSolve/netgen/pull/221 + +Index: ng/ngappinit.cpp +--- ng/ngappinit.cpp.orig ++++ ng/ngappinit.cpp +@@ -256,6 +256,7 @@ int main(int argc, char ** argv) + Tk_MainLoop(); + Tcl_DeleteInterp (myinterp); + #ifdef NETGEN_PYTHON ++ py::scoped_interpreter guard{}; + py::gil_scoped_acquire ensure_gil; +
No comments:
Post a Comment