netgen-mesher 6.2.2506__cp313-cp313-win_amd64.whl → 6.2.2506.post31.dev0__cp313-cp313-win_amd64.whl

netgen/__init__.pyi

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from netgen.libngpy._meshing import _Redraw
+from netgen.libngpy._meshing.pybind11_detail_function_record_v1_msvc_md_mscver19 import _Redraw
 from pathlib._local import Path
 from pyngcore.pyngcore import Timer
 import sys

netgen/cmake/NetgenConfig.cmake

@@ -1,14 +1,15 @@
-set(NETGEN_VERSION "6.2.2506-v6.2.2506-v6.2.2506")
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")
+set(NETGEN_VERSION "6.2.2506-31-ga34e6d60")
 set(NETGEN_VERSION_MAJOR "6")
 set(NETGEN_VERSION_MINOR "2")
 set(NETGEN_VERSION_PATCH "2506")
-set(NETGEN_VERSION_TWEAK "v6.2.2506")
+set(NETGEN_VERSION_TWEAK "31")
 
 get_filename_component(NETGEN_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 
 get_filename_component(NETGEN_DIR "${NETGEN_CMAKE_DIR}/../../" ABSOLUTE)
 
-set(NETGEN_COMPILE_DEFINITIONS "$<$<CONFIG:Release>:UNICODE>;$<$<CONFIG:Release>:_UNICODE>;$<$<CONFIG:Release>:_CRT_SECURE_NO_WARNINGS>;$<$<CONFIG:Release>:_CRT_NONSTDC_NO_DEPRECATE>;OCCGEOMETRY")
+set(NETGEN_COMPILE_DEFINITIONS "")
 
 get_filename_component(NETGEN_INCLUDE_DIR "${NETGEN_CMAKE_DIR}/../include" ABSOLUTE)
 get_filename_component(NETGEN_BINARY_DIR "${NETGEN_CMAKE_DIR}/../" ABSOLUTE)

netgen/config/__init__.pyi

@@ -14,14 +14,14 @@ INTEL_MIC: bool = False
 NETGEN_PYTHON_PACKAGE_NAME: str = 'netgen-mesher'
 NETGEN_PYTHON_RPATH: str = 'netgen'
 NETGEN_PYTHON_RPATH_BIN: str = 'netgen'
-NETGEN_VERSION: str = '6.2.2506-v6.2.2506-v6.2.2506'
-NETGEN_VERSION_GIT: str = 'v6.2.2506'
-NETGEN_VERSION_HASH: str = 'v6.2.2506'
+NETGEN_VERSION: str = '6.2.2506-31-ga34e6d60'
+NETGEN_VERSION_GIT: str = 'v6.2.2506-31-ga34e6d60'
+NETGEN_VERSION_HASH: str = 'ga34e6d60'
 NETGEN_VERSION_MAJOR: str = '6'
 NETGEN_VERSION_MINOR: str = '2'
 NETGEN_VERSION_PATCH: str = '2506'
-NETGEN_VERSION_PYTHON: str = '6.2.2506'
-NETGEN_VERSION_TWEAK: str = 'v6.2.2506'
+NETGEN_VERSION_PYTHON: str = '6.2.2506.post31.dev0'
+NETGEN_VERSION_TWEAK: str = '31'
 NG_COMPILE_FLAGS: str = '/arch:AVX2'
 NG_INSTALL_DIR_BIN: str = 'netgen'
 NG_INSTALL_DIR_CMAKE: str = 'netgen/cmake'
@@ -49,4 +49,4 @@ USE_SPDLOG: bool = False
 is_python_package: bool = True
 ngcore_compile_definitions: str = 'NETGEN_PYTHON;NG_PYTHON;PYBIND11_SIMPLE_GIL_MANAGEMENT;_WIN32_WINNT=0x1000;WNT;WNT_WINDOW;NOMINMAX;MSVC_EXPRESS;_CRT_SECURE_NO_WARNINGS;HAVE_STRUCT_TIMESPEC;WIN32'
 ngcore_compile_options: str = '/arch:AVX2;/bigobj;$<BUILD_INTERFACE:/MP;/W1;/wd4068>'
-version: str = 'v6.2.2506'
+version: str = 'v6.2.2506-31-ga34e6d60'

netgen/config/config.py

@@ -42,15 +42,15 @@ NG_COMPILE_FLAGS           = "/arch:AVX2"
 ngcore_compile_options     = "/arch:AVX2;/bigobj;$<BUILD_INTERFACE:/MP;/W1;/wd4068>"
 ngcore_compile_definitions = "NETGEN_PYTHON;NG_PYTHON;PYBIND11_SIMPLE_GIL_MANAGEMENT;_WIN32_WINNT=0x1000;WNT;WNT_WINDOW;NOMINMAX;MSVC_EXPRESS;_CRT_SECURE_NO_WARNINGS;HAVE_STRUCT_TIMESPEC;WIN32"
 
-NETGEN_VERSION = "6.2.2506-v6.2.2506-v6.2.2506"
-NETGEN_VERSION_GIT = "v6.2.2506"
-NETGEN_VERSION_PYTHON = "6.2.2506"
+NETGEN_VERSION = "6.2.2506-31-ga34e6d60"
+NETGEN_VERSION_GIT = "v6.2.2506-31-ga34e6d60"
+NETGEN_VERSION_PYTHON = "6.2.2506.post31.dev0"
 
 NETGEN_VERSION_MAJOR = "6"
 NETGEN_VERSION_MINOR = "2"
-NETGEN_VERSION_TWEAK = "v6.2.2506"
+NETGEN_VERSION_TWEAK = "31"
 NETGEN_VERSION_PATCH = "2506"
-NETGEN_VERSION_HASH = "v6.2.2506"
+NETGEN_VERSION_HASH = "ga34e6d60"
 
 PYTHON_VERSION       = "3.13.2"
 PYTHON_VERSION_MAJOR = "3"

netgen/config/config.pyi

@@ -16,14 +16,14 @@ INTEL_MIC: bool = False
 NETGEN_PYTHON_PACKAGE_NAME: str = 'netgen-mesher'
 NETGEN_PYTHON_RPATH: str = 'netgen'
 NETGEN_PYTHON_RPATH_BIN: str = 'netgen'
-NETGEN_VERSION: str = '6.2.2506-v6.2.2506-v6.2.2506'
-NETGEN_VERSION_GIT: str = 'v6.2.2506'
-NETGEN_VERSION_HASH: str = 'v6.2.2506'
+NETGEN_VERSION: str = '6.2.2506-31-ga34e6d60'
+NETGEN_VERSION_GIT: str = 'v6.2.2506-31-ga34e6d60'
+NETGEN_VERSION_HASH: str = 'ga34e6d60'
 NETGEN_VERSION_MAJOR: str = '6'
 NETGEN_VERSION_MINOR: str = '2'
 NETGEN_VERSION_PATCH: str = '2506'
-NETGEN_VERSION_PYTHON: str = '6.2.2506'
-NETGEN_VERSION_TWEAK: str = 'v6.2.2506'
+NETGEN_VERSION_PYTHON: str = '6.2.2506.post31.dev0'
+NETGEN_VERSION_TWEAK: str = '31'
 NG_COMPILE_FLAGS: str = '/arch:AVX2'
 NG_INSTALL_DIR_BIN: str = 'netgen'
 NG_INSTALL_DIR_CMAKE: str = 'netgen/cmake'
@@ -51,4 +51,4 @@ USE_SPDLOG: bool = False
 is_python_package: bool = True
 ngcore_compile_definitions: str = 'NETGEN_PYTHON;NG_PYTHON;PYBIND11_SIMPLE_GIL_MANAGEMENT;_WIN32_WINNT=0x1000;WNT;WNT_WINDOW;NOMINMAX;MSVC_EXPRESS;_CRT_SECURE_NO_WARNINGS;HAVE_STRUCT_TIMESPEC;WIN32'
 ngcore_compile_options: str = '/arch:AVX2;/bigobj;$<BUILD_INTERFACE:/MP;/W1;/wd4068>'
-version: str = 'v6.2.2506'
+version: str = 'v6.2.2506-31-ga34e6d60'

netgen/include/core/archive.hpp

@@ -70,7 +70,8 @@ namespace ngcore
 
   
 #ifdef NETGEN_PYTHON
-  pybind11::object CastAnyToPy(const std::any& a);
+  NGCORE_API pybind11::object CastAnyToPy(const std::any& a);
+  NGCORE_API std::any CastPyToAny(pybind11::object& h);
 #endif // NETGEN_PYTHON
 
   class NGCORE_API Archive;
@@ -184,6 +185,7 @@ namespace ngcore
 #ifdef NETGEN_PYTHON
       // std::function<pybind11::object(const std::any&)> anyToPyCaster;
       pybind11::object (*anyToPyCaster)(const std::any&);
+      std::any (*pyToAnyCaster)(pybind11::object&);
 #endif // NETGEN_PYTHON
     };
   } // namespace detail
@@ -234,7 +236,10 @@ namespace ngcore
     // it archives the object normally.
 #ifdef NETGEN_PYTHON
     template<typename T>
-    Archive& Shallow(T& val); // implemented in python_ngcore.hpp
+    Archive& Shallow(T& val); // implemented in register_archive.hpp
+#ifndef __CUDACC__
+    Archive& Shallow(std::any& val); // implemented in python_ngcore.cpp
+#endif // __CUDACC__
 #else // NETGEN_PYTHON
     template<typename T>
     Archive& Shallow(T& val)
@@ -276,6 +281,12 @@ namespace ngcore
     virtual Archive & operator & (std::string & str) = 0;
     virtual Archive & operator & (char *& str) = 0;
 
+    Archive & operator &(std::any& a)
+    {
+      Shallow(a);
+      return *this;
+    }
+
     Archive & operator & (VersionInfo & version)
     {
         if(Output())
@@ -505,7 +516,8 @@ namespace ngcore
     template <typename T>
     Archive& operator & (ngcore::Shallow<T>& shallow)
     {
-      this->Shallow(shallow.val);
+      if(shallow_to_python)
+        Shallow(shallow.val);
       return *this;
     }
       
@@ -763,6 +775,7 @@ namespace ngcore
 
 #ifdef NETGEN_PYTHON
     friend pybind11::object CastAnyToPy(const std::any&);
+    friend std::any CastPyToAny(pybind11::object&);
 #endif // NETGEN_PYTHON
 
     // Returns ClassArchiveInfo of Demangled typeid

netgen/include/core/flags.hpp

@@ -47,7 +47,7 @@ namespace ngcore
     /// copy flags 
     Flags (const Flags & flags);
     /// steal flags
-    Flags (Flags && flags);
+    Flags (Flags && flags) = default;
     ///
     Flags (std::initializer_list<std::string> list);
     /// 

netgen/include/core/memtracer.hpp

@@ -198,7 +198,7 @@ namespace ngcore
     }
 #else // defined(NETGEN_TRACE_MEMORY) && !defined(__CUDA_ARCH__)
   public:
-    MemoryTracer() {}
+    NETGEN_INLINE MemoryTracer() {}
     MemoryTracer( std::string /* name */ ) {}
     template <typename... TRest>
     MemoryTracer( std::string /* name */, TRest & ... ) {}

netgen/include/core/ngcore.hpp

@@ -23,5 +23,10 @@
 #include "ngstream.hpp"
 #include "utils.hpp"
 #include "ranges.hpp"
+#include "statushandler.hpp"
 
 #endif // NETGEN_CORE_NGCORE_HPP
+
+
+
+

netgen/include/core/register_archive.hpp

@@ -84,6 +84,14 @@ namespace ngcore {
         return pybind11::cast(val);
       }
     };
+    info.pyToAnyCaster = [](pybind11::object &obj)
+    {
+      if constexpr(has_shared_from_this2<T>::value || !std::is_copy_constructible<T>::value)
+        return std::any { obj.cast<std::shared_ptr<T>>() };
+      else
+        return std::any { obj.cast<T>() };
+    };
+
 #endif // NETGEN_PYTHON
     Archive::SetArchiveRegister(std::string(Demangle(typeid(T).name())),info);
   }

netgen/include/core/simd_arm64.hpp

@@ -266,15 +266,24 @@ namespace ngcore
 
   NETGEN_INLINE SIMD<double,2> rsqrt (SIMD<double,2> x)
   {
-    // return 1.0 / sqrt(x);
+    return 1.0 / sqrt(x);
   
-    SIMD<double,2> y = vrsqrteq_f64(x.Data());
+    // SIMD<double,2> y = vrsqrteq_f64(x.Data());
+
+    /*
+    y = y * vrsqrtsq_f64( (x*y).Data(), y.Data());
+    y = y * vrsqrtsq_f64( (x*y).Data(), y.Data());
+    y = y * vrsqrtsq_f64( (x*y).Data(), y.Data());
+    */
+
+    /*
     auto x_half = 0.5*x;
     y = y * (1.5 - (x_half * y * y));
     y = y * (1.5 - (x_half * y * y));
-    // y = y * (1.5 - (x_half * y * y));
-    y = y + 0.5 * (x*y*y-1);
+    y = y * (1.5 - (x_half * y * y));
+    
     return y;
+    */
   }
   
   

netgen/include/core/simd_math.hpp

@@ -57,7 +57,7 @@ namespace ngcore
   template <int N>
   auto sincos (SIMD<double,N> x)
   {
-    auto y = round(x / (M_PI/2));
+    auto y = round((2/M_PI) * x);
     auto q = lround(y);
   
     auto [s1,c1] = sincos_reduced(x - y * (M_PI/2));
@@ -151,7 +151,7 @@ namespace ngcore
     // x = ldexp( x, n );
   }
 
-
+  /*
   inline auto Test1 (SIMD<double> x)
   {
     return myexp(x);
@@ -171,6 +171,7 @@ namespace ngcore
   {
     return sincos(x);
   }
+  */
   
 }
 

netgen/include/core/statushandler.hpp

@@ -0,0 +1,37 @@
+#ifndef NETGEN_CORE_STATUSHANDLER
+#define NETGEN_CORE_STATUSHANDLER
+
+#include <string>
+#include "utils.hpp"
+
+namespace ngcore
+{
+  
+  class NGCORE_API multithreadt
+  {
+  public:
+    int pause;
+    int testmode;
+    int redraw;
+    int drawing;
+    int terminate;
+    int running;
+    double percent;
+    const char * task;
+    bool demorunning;
+    std::string * tcl_todo = new std::string("");  // tcl commands set from parallel thread
+    multithreadt();
+  };
+
+  NGCORE_API extern volatile multithreadt multithread;
+
+  
+  extern NGCORE_API void SetStatMsg(const std::string& s);
+
+  extern NGCORE_API void PushStatus(const std::string& s);
+  extern NGCORE_API void PushStatusF(const std::string& s);
+  extern NGCORE_API void PopStatus();
+  extern NGCORE_API void SetThreadPercent(double percent);
+  extern NGCORE_API void GetStatus(std::string & s, double & percentage);
+}
+#endif

netgen/include/include/netgen_version.hpp

@@ -1,9 +1,9 @@
 #ifndef NETGEN_VERSION_HPP_INCLUDED
 #define NETGEN_VERSION_HPP_INCLUDED
-#define NETGEN_VERSION "6.2.2506"
+#define NETGEN_VERSION "6.2.2506-31-ga34e6d60"
 #define NETGEN_VERSION_MAJOR 6
 #define NETGEN_VERSION_MINOR 2
 #define NETGEN_VERSION_PATCH 2506
-#define NETGEN_VERSION_TWEAK 0
-#define NETGEN_VERSION_HASH "g3fadd39f"
+#define NETGEN_VERSION_TWEAK 31
+#define NETGEN_VERSION_HASH "ga34e6d60"
 #endif // NETGEN_VERSION_HPP_INCLUDED

netgen/include/meshing/basegeom.hpp

@@ -42,10 +42,7 @@ namespace netgen
     string GetName() const { return name ? *name : "default"; }
     Vec<4> GetColor() { return col ? *col : Vec<4>{0., 1., 0., 1.}; }
 
-    void DoArchive(Archive& ar)
-    {
-        ar & name & col & maxh & hpref & layer;
-    }
+    void DoArchive(Archive& ar);
   };
 
   class GeometryShape;

netgen/include/meshing/global.hpp

@@ -31,23 +31,6 @@ namespace netgen
 
   DLL_HEADER extern mutex tcl_todo_mutex;
 
-  class DLL_HEADER multithreadt
-  {
-  public:
-    int pause;
-    int testmode;
-    int redraw;
-    int drawing;
-    int terminate;
-    int running;
-    double percent;
-    const char * task;
-    bool demorunning;
-    string * tcl_todo = new string("");  // tcl commands set from parallel thread
-    multithreadt();
-  };
-
-  DLL_HEADER extern volatile multithreadt multithread;
 
   class DebugParameters;
   class Mesh;

netgen/include/meshing/hpref_tet.hpp

@@ -4184,6 +4184,47 @@ HPRef_Struct reftet_3f_0e_0v =
 
 
 
+
+// HP_TET_ALFELD
+int reftet_Alfeld_splitedges[][3] =
+{
+  { 0, 0, 0 }
+};
+int reftet_Alfeld_splitfaces[][4] =
+{
+  { 0, 0, 0, 0 }
+};
+
+int reftet_Alfeld_splitelements[][5] =
+  {
+    { 1, 2, 3, 4, 5},
+    { 0 }
+  };
+
+HPREF_ELEMENT_TYPE reftet_Alfeld_newelstypes[] =
+{
+  HP_TET, HP_TET, HP_TET, HP_TET,
+  HP_NONE, 
+};
+
+int reftet_Alfeld_newels[][8] =
+{
+  { 1, 2, 3, 5 }, 
+  { 1, 4, 2, 5 }, 
+  { 1, 3, 4, 5 },
+  { 3, 2, 4, 5 }
+};
+HPRef_Struct reftet_Alfeld =
+{
+  HP_TET,
+  reftet_Alfeld_splitedges, 
+  reftet_Alfeld_splitfaces,
+  reftet_Alfeld_splitelements,  
+  reftet_Alfeld_newelstypes,
+  reftet_Alfeld_newels
+};
+
+
 /*
 
 */

netgen/include/meshing/hprefinement.hpp

@@ -189,6 +189,8 @@ enum HPREF_ELEMENT_TYPE {
   
   HP_TET_3F_0E_0V = 700,  // 3 singular faces, no additional points or edges  NEW   done 
 
+  HP_TET_ALFELD,
+  
   HP_PRISM = 1000,
   HP_PRISM_SINGEDGE,
   HP_PRISM_SINGEDGE_V12,

netgen/include/meshing/msghandler.hpp

@@ -45,13 +45,16 @@ namespace netgen
 			     const MyStr& s5="", const MyStr& s6="", const MyStr& s7="", const MyStr& s8="");
   extern DLL_HEADER void PrintTime(const MyStr& s1="", const MyStr& s2="", const MyStr& s3="", const MyStr& s4="", 
 			const MyStr& s5="", const MyStr& s6="", const MyStr& s7="", const MyStr& s8="");
-  extern DLL_HEADER void SetStatMsg(const MyStr& s);
 
-  extern DLL_HEADER void PushStatus(const MyStr& s);
-  extern DLL_HEADER void PushStatusF(const MyStr& s);
-  extern DLL_HEADER void PopStatus();
-  extern DLL_HEADER void SetThreadPercent(double percent);
-  extern DLL_HEADER void GetStatus(MyStr & s, double & percentage);
+
+
+
+  inline void PushStatusF(const std::string& s)
+  {
+    PushStatus (s);
+    PrintFnStart(s);
+  }
+
 }
 
 

netgen/include/nginterface.h

@@ -353,10 +353,11 @@ extern "C" {
 
   DLL_HEADER void RunParallel ( void * (*fun)(void *), void * in);
 
-  DLL_HEADER void Ng_PushStatus (const char * str);
+  #define NG_STATUS_USES_STD_STRING
+  DLL_HEADER void Ng_PushStatus (const std::string& str);
   DLL_HEADER void Ng_PopStatus ();
   DLL_HEADER void Ng_SetThreadPercentage (double percent);
-  DLL_HEADER void Ng_GetStatus (char ** str, double & percent);
+  DLL_HEADER void Ng_GetStatus (std::string& str, double & percent);
 
   DLL_HEADER void Ng_SetTerminate(void);
   DLL_HEADER void Ng_UnSetTerminate(void);

netgen/include/occ/occ_utils.hpp

@@ -71,6 +71,20 @@ namespace netgen
         return gp_Pnt(p(0), p(1), p(2));
     }
 
+    inline void CheckValidPropertyType(const TopoDS_Shape & shape)
+    {
+        switch (shape.ShapeType())
+        {
+          case TopAbs_SOLID:
+          case TopAbs_FACE:
+          case TopAbs_EDGE:
+          case TopAbs_VERTEX:
+            break;
+          default:
+            throw Exception("Cannot query properties of compound shapes - setting properties sets property on all highest dimension subshape type");
+        }
+    }
+
     DLL_HEADER Box<3> GetBoundingBox( const TopoDS_Shape & shape );
 
     struct OCCIdentification

netgen/include/occ/occgeom.hpp

@@ -146,6 +146,14 @@ namespace netgen
 
     static ShapeProperties& GetProperties(const TopoDS_Shape& shape)
     {
+      try
+        {
+          CheckValidPropertyType(shape);
+        }
+      catch(Exception& e)
+        {
+          cerr << "WARNING: " << e.what() << endl;
+        }
       auto index = OCCGeometry::global_shape_property_indices.FindIndex(shape);
       if(index > 0)
         return OCCGeometry::global_shape_properties

netgen/include/pybind11/attr.h

@@ -12,6 +12,7 @@
 
 #include "detail/common.h"
 #include "cast.h"
+#include "trampoline_self_life_support.h"
 
 #include <functional>
 
@@ -81,6 +82,10 @@ struct dynamic_attr {};
 /// Annotation which enables the buffer protocol for a type
 struct buffer_protocol {};
 
+/// Annotation which enables releasing the GIL before calling the C++ destructor of wrapped
+/// instances (pybind/pybind11#1446).
+struct release_gil_before_calling_cpp_dtor {};
+
 /// Annotation which requests that a special metaclass is created for a type
 struct metaclass {
     handle value;
@@ -188,6 +193,7 @@ struct argument_record {
 
 /// Internal data structure which holds metadata about a bound function (signature, overloads,
 /// etc.)
+#define PYBIND11_DETAIL_FUNCTION_RECORD_ABI_ID "v1" // PLEASE UPDATE if the struct is changed.
 struct function_record {
     function_record()
         : is_constructor(false), is_new_style_constructor(false), is_stateless(false),
@@ -267,12 +273,18 @@ struct function_record {
     /// Pointer to next overload
     function_record *next = nullptr;
 };
+// The main purpose of this macro is to make it easy to pin-point the critically related code
+// sections.
+#define PYBIND11_ENSURE_PRECONDITION_FOR_FUNCTIONAL_H_PERFORMANCE_OPTIMIZATIONS(...)              \
+    static_assert(                                                                                \
+        __VA_ARGS__,                                                                              \
+        "Violation of precondition for pybind11/functional.h performance optimizations!")
 
 /// Special data structure which (temporarily) holds metadata about a bound class
 struct type_record {
     PYBIND11_NOINLINE type_record()
         : multiple_inheritance(false), dynamic_attr(false), buffer_protocol(false),
-          default_holder(true), module_local(false), is_final(false) {}
+          module_local(false), is_final(false), release_gil_before_calling_cpp_dtor(false) {}
 
     /// Handle to the parent scope
     handle scope;
@@ -301,6 +313,12 @@ struct type_record {
     /// Function pointer to class_<..>::dealloc
     void (*dealloc)(detail::value_and_holder &) = nullptr;
 
+    /// Function pointer for casting alias class (aka trampoline) pointer to
+    /// trampoline_self_life_support pointer. Sidesteps cross-DSO RTTI issues
+    /// on platforms like macOS (see PR #5728 for details).
+    get_trampoline_self_life_support_fn get_trampoline_self_life_support
+        = [](void *) -> trampoline_self_life_support * { return nullptr; };
+
     /// List of base classes of the newly created type
     list bases;
 
@@ -322,15 +340,17 @@ struct type_record {
     /// Does the class implement the buffer protocol?
     bool buffer_protocol : 1;
 
-    /// Is the default (unique_ptr) holder type used?
-    bool default_holder : 1;
-
     /// Is the class definition local to the module shared object?
     bool module_local : 1;
 
     /// Is the class inheritable from python classes?
     bool is_final : 1;
 
+    /// Solves pybind/pybind11#1446
+    bool release_gil_before_calling_cpp_dtor : 1;
+
+    holder_enum_t holder_enum_v = holder_enum_t::undefined;
+
     PYBIND11_NOINLINE void add_base(const std::type_info &base, void *(*caster)(void *) ) {
         auto *base_info = detail::get_type_info(base, false);
         if (!base_info) {
@@ -340,18 +360,22 @@ struct type_record {
                           + "\" referenced unknown base type \"" + tname + "\"");
         }
 
-        if (default_holder != base_info->default_holder) {
+        // SMART_HOLDER_BAKEIN_FOLLOW_ON: Refine holder compatibility checks.
+        bool this_has_unique_ptr_holder = (holder_enum_v == holder_enum_t::std_unique_ptr);
+        bool base_has_unique_ptr_holder
+            = (base_info->holder_enum_v == holder_enum_t::std_unique_ptr);
+        if (this_has_unique_ptr_holder != base_has_unique_ptr_holder) {
             std::string tname(base.name());
             detail::clean_type_id(tname);
             pybind11_fail("generic_type: type \"" + std::string(name) + "\" "
-                          + (default_holder ? "does not have" : "has")
+                          + (this_has_unique_ptr_holder ? "does not have" : "has")
                           + " a non-default holder type while its base \"" + tname + "\" "
-                          + (base_info->default_holder ? "does not" : "does"));
+                          + (base_has_unique_ptr_holder ? "does not" : "does"));
         }
 
         bases.append((PyObject *) base_info->type);
 
-#if PY_VERSION_HEX < 0x030B0000
+#ifdef PYBIND11_BACKWARD_COMPATIBILITY_TP_DICTOFFSET
         dynamic_attr |= base_info->type->tp_dictoffset != 0;
 #else
         dynamic_attr |= (base_info->type->tp_flags & Py_TPFLAGS_MANAGED_DICT) != 0;
@@ -603,6 +627,14 @@ struct process_attribute<module_local> : process_attribute_default<module_local>
     static void init(const module_local &l, type_record *r) { r->module_local = l.value; }
 };
 
+template <>
+struct process_attribute<release_gil_before_calling_cpp_dtor>
+    : process_attribute_default<release_gil_before_calling_cpp_dtor> {
+    static void init(const release_gil_before_calling_cpp_dtor &, type_record *r) {
+        r->release_gil_before_calling_cpp_dtor = true;
+    }
+};
+
 /// Process a 'prepend' attribute, putting this at the beginning of the overload chain
 template <>
 struct process_attribute<prepend> : process_attribute_default<prepend> {

netgen/include/pybind11/buffer_info.h

@@ -102,22 +102,22 @@ struct buffer_info {
     template <typename T>
     buffer_info(const T *ptr, ssize_t size, bool readonly = true)
         : buffer_info(
-            const_cast<T *>(ptr), sizeof(T), format_descriptor<T>::format(), size, readonly) {}
+              const_cast<T *>(ptr), sizeof(T), format_descriptor<T>::format(), size, readonly) {}
 
     explicit buffer_info(Py_buffer *view, bool ownview = true)
         : buffer_info(
-            view->buf,
-            view->itemsize,
-            view->format,
-            view->ndim,
-            {view->shape, view->shape + view->ndim},
-            /* Though buffer::request() requests PyBUF_STRIDES, ctypes objects
-             * ignore this flag and return a view with NULL strides.
-             * When strides are NULL, build them manually.  */
-            view->strides
-                ? std::vector<ssize_t>(view->strides, view->strides + view->ndim)
-                : detail::c_strides({view->shape, view->shape + view->ndim}, view->itemsize),
-            (view->readonly != 0)) {
+              view->buf,
+              view->itemsize,
+              view->format,
+              view->ndim,
+              {view->shape, view->shape + view->ndim},
+              /* Though buffer::request() requests PyBUF_STRIDES, ctypes objects
+               * ignore this flag and return a view with NULL strides.
+               * When strides are NULL, build them manually.  */
+              view->strides
+                  ? std::vector<ssize_t>(view->strides, view->strides + view->ndim)
+                  : detail::c_strides({view->shape, view->shape + view->ndim}, view->itemsize),
+              (view->readonly != 0)) {
         // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
         this->m_view = view;
         // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
@@ -176,7 +176,7 @@ private:
                 detail::any_container<ssize_t> &&strides_in,
                 bool readonly)
         : buffer_info(
-            ptr, itemsize, format, ndim, std::move(shape_in), std::move(strides_in), readonly) {}
+              ptr, itemsize, format, ndim, std::move(shape_in), std::move(strides_in), readonly) {}
 
     Py_buffer *m_view = nullptr;
     bool ownview = false;