Check Netgen version at run-time, update Netgen

NGSolve · Jul 23, 2020 · 6eaeccc · 6eaeccc
1 parent d5c93d7
commit 6eaeccc
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/external_dependencies/netgen b/external_dependencies/netgen
diff --git a/ngstd/templates.cpp b/ngstd/templates.cpp
@@ -10,6 +10,7 @@
 
 #include <ngstd.hpp>
 #include <ngsolve_version.hpp>
+#include <netgen_version.hpp>
 
 namespace ngstd
 {
@@ -29,4 +30,19 @@ namespace ngstd
   }();
 #endif // USE_MKL
 
+  static bool dummy = [] ()
+  {
+    ngcore::SetLibraryVersion("ngsolve", NGSOLVE_VERSION);
+    auto ng_version_compiled = ngcore::VersionInfo(NETGEN_VERSION);
+    auto ng_version=ngcore::GetLibraryVersion("netgen");
+    if( ng_version != ng_version_compiled )
+    {
+      cerr << "================================================================" << endl;
+      cerr << "WARNING: NGSolve was compiled with Netgen " << endl;
+      cerr << "         version " << ng_version_compiled.to_string() << " but" << endl;
+      cerr << "         version " << ng_version.to_string() << " is loaded at run-time!!!" << endl;
+      cerr << "================================================================" << endl;
+    }
+    return true;
+  }();
 }
diff --git a/solve/ngsolve.cpp b/solve/ngsolve.cpp
@@ -208,9 +208,13 @@ static shared_ptr<PDE> pde;
     Socket & sock;
   public:
     SocketOutArchive (Socket & asock) : Archive(true), sock(asock)
-    { (*this) & GetLibraryVersions(); }
+    {
+      auto versions = GetLibraryVersions();
+      (*this) & versions;
+    }
+
     const VersionInfo& GetVersion(const std::string& library)
-    { return GetLibraryVersions()[library]; }
+    { return GetLibraryVersions().at(library); }
 
     using Archive::operator&;
     virtual Archive & operator & (double & d)
+2 −0		CMakeLists.txt
+11 −1		cmake/generate_version_file.cmake
+1 −0		libsrc/core/CMakeLists.txt
+1 −12		libsrc/core/archive.cpp
+0 −6		libsrc/core/archive.hpp
+6 −3		libsrc/core/exception.cpp
+3 −2		libsrc/core/python_ngcore.hpp
+29 −0		libsrc/core/version.cpp
+8 −0		libsrc/core/version.hpp
+0 −3		libsrc/geom2d/genmesh2d.cpp
+1 −1		libsrc/interface/nginterface.cpp
+0 −5		libsrc/interface/readuser.cpp
+18 −18		libsrc/meshing/boundarylayer.cpp
+7 −2		libsrc/meshing/improve3.cpp
+10 −24		libsrc/meshing/meshclass.cpp
+2 −5		libsrc/meshing/meshtype.cpp
+0 −19		libsrc/meshing/meshtype.hpp
+279 −279		tests/pytest/results.json