netgen-mesher 6.2.2504.post11.dev0__cp313-cp313-win_amd64.whl → 6.2.2506.post48.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
@@ -17,6 +17,6 @@ def _get_diagnostics():
 def load_occ_libs():
     ...
 __diagnostics_template: str = '\nNetgen diagnostics:\n    sys.platform:          {sys.platform}\n    sys.executable:        {sys.executable}\n    sys.version:           {sys.version}\n    Netgen python version: {config.PYTHON_VERSION}\n    Netgen path            {__file__}\n    Netgen config          {config.__file__}\n    Netgen version         {config.NETGEN_VERSION}\n    sys.path: {sys.path}\n'
-_netgen_bin_dir: str = 'C:\\gitlabci\\tools\\builds\\3zsqG5ns\\0\\ngsolve\\ngsolve\\external_dependencies\\netgen\\_skbuild\\win-amd64-3.13\\cmake-install\\netgen'
-_netgen_lib_dir: str = 'C:\\gitlabci\\tools\\builds\\3zsqG5ns\\0\\ngsolve\\ngsolve\\external_dependencies\\netgen\\_skbuild\\win-amd64-3.13\\cmake-install\\netgen'
+_netgen_bin_dir: str = 'C:\\gitlabci\\tools\\builds\\3zsqG5ns9\\0\\ngsolve\\ngsolve\\external_dependencies\\netgen\\_skbuild\\win-amd64-3.13\\cmake-install\\netgen'
+_netgen_lib_dir: str = 'C:\\gitlabci\\tools\\builds\\3zsqG5ns9\\0\\ngsolve\\ngsolve\\external_dependencies\\netgen\\_skbuild\\win-amd64-3.13\\cmake-install\\netgen'
 v: sys.version_info  # value = sys.version_info(major=3, minor=13, micro=2, releaselevel='final', serial=0)

netgen/cmake/NetgenConfig.cmake

@@ -1,14 +1,15 @@
-set(NETGEN_VERSION "6.2.2504-11-gfea644ae")
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")
+set(NETGEN_VERSION "6.2.2506-48-g8263c0bc")
 set(NETGEN_VERSION_MAJOR "6")
 set(NETGEN_VERSION_MINOR "2")
-set(NETGEN_VERSION_PATCH "2504")
-set(NETGEN_VERSION_TWEAK "11")
+set(NETGEN_VERSION_PATCH "2506")
+set(NETGEN_VERSION_TWEAK "48")
 
 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)
@@ -16,7 +17,7 @@ get_filename_component(NETGEN_LIBRARY_DIR "${NETGEN_CMAKE_DIR}/../lib" ABSOLUTE)
 get_filename_component(NETGEN_PYTHON_DIR "${NETGEN_CMAKE_DIR}/../../" ABSOLUTE)
 get_filename_component(NETGEN_RESOURCE_DIR "${NETGEN_CMAKE_DIR}/../../share" ABSOLUTE)
 
-set(NETGEN_SOURCE_DIR "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen")
+set(NETGEN_SOURCE_DIR "C:/gitlabci/tools/builds/3zsqG5ns9/0/ngsolve/ngsolve/external_dependencies/netgen")
 
 set(NETGEN_BUILD_FOR_CONDA "ON")
 set(NETGEN_CHECK_RANGE "OFF")
@@ -41,15 +42,15 @@ set(NETGEN_OPENGL_LIBRARIES "opengl32;glu32")
 set(NETGEN_PYTHON_EXECUTABLE "C:/Python313/python.exe")
 set(NETGEN_PYTHON_INCLUDE_DIRS "C:/Python313/Include")
 set(NETGEN_PYTHON_LIBRARIES "C:/Python313/libs/python313.lib")
-set(NETGEN_TCL_INCLUDE_PATH "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.13/cmake-build/dependencies/src/project_tcl/generic")
+set(NETGEN_TCL_INCLUDE_PATH "C:/gitlabci/tools/builds/3zsqG5ns9/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.13/cmake-build/dependencies/src/project_tcl/generic")
 set(NETGEN_TCL_LIBRARY "C:/Python313/tcl/tclstub86.lib")
 set(NETGEN_TK_DND_LIBRARY "")
-set(NETGEN_TK_INCLUDE_PATH "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.13/cmake-build/dependencies/src/project_tk/generic")
+set(NETGEN_TK_INCLUDE_PATH "C:/gitlabci/tools/builds/3zsqG5ns9/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.13/cmake-build/dependencies/src/project_tk/generic")
 set(NETGEN_TK_LIBRARY "C:/Python313/tcl/tkstub86.lib")
 set(NETGEN_X11_X11_LIB "")
 set(NETGEN_X11_Xmu_LIB "")
-set(NETGEN_ZLIB_INCLUDE_DIRS "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.13/cmake-build/dependencies/zlib/include")
-set(NETGEN_ZLIB_LIBRARIES "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.13/cmake-build/dependencies/zlib/lib/zlibstatic.lib")
+set(NETGEN_ZLIB_INCLUDE_DIRS "C:/gitlabci/tools/builds/3zsqG5ns9/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.13/cmake-build/dependencies/zlib/include")
+set(NETGEN_ZLIB_LIBRARIES "C:/gitlabci/tools/builds/3zsqG5ns9/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.13/cmake-build/dependencies/zlib/lib/zlibstatic.lib")
 
 set(NETGEN_USE_GUI ON)
 set(NETGEN_USE_PYTHON ON)

netgen/config/__init__.pyi

@@ -5,7 +5,7 @@ __all__ = ['BUILD_FOR_CONDA', 'BUILD_STUB_FILES', 'CHECK_RANGE', 'CMAKE_INSTALL_
 BUILD_FOR_CONDA: bool = True
 BUILD_STUB_FILES: bool = True
 CHECK_RANGE: bool = False
-CMAKE_INSTALL_PREFIX: str = 'C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.13/cmake-install'
+CMAKE_INSTALL_PREFIX: str = 'C:/gitlabci/tools/builds/3zsqG5ns9/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.13/cmake-install'
 DEBUG_LOG: bool = False
 ENABLE_CPP_CORE_GUIDELINES_CHECK: bool = False
 ENABLE_UNIT_TESTS: bool = False
@@ -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.2504-11-gfea644ae'
-NETGEN_VERSION_GIT: str = 'v6.2.2504-11-gfea644ae'
-NETGEN_VERSION_HASH: str = 'gfea644ae'
+NETGEN_VERSION: str = '6.2.2506-48-g8263c0bc'
+NETGEN_VERSION_GIT: str = 'v6.2.2506-48-g8263c0bc'
+NETGEN_VERSION_HASH: str = 'g8263c0bc'
 NETGEN_VERSION_MAJOR: str = '6'
 NETGEN_VERSION_MINOR: str = '2'
-NETGEN_VERSION_PATCH: str = '2504'
-NETGEN_VERSION_PYTHON: str = '6.2.2504.post11.dev0'
-NETGEN_VERSION_TWEAK: str = '11'
+NETGEN_VERSION_PATCH: str = '2506'
+NETGEN_VERSION_PYTHON: str = '6.2.2506.post48.dev0'
+NETGEN_VERSION_TWEAK: str = '48'
 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.2504-11-gfea644ae'
+version: str = 'v6.2.2506-48-g8263c0bc'

netgen/config/config.py

@@ -26,7 +26,7 @@ USE_OCC             = _cmake_to_bool("ON")
 USE_PYTHON          = _cmake_to_bool("ON")
 USE_SPDLOG          = _cmake_to_bool("")
 
-CMAKE_INSTALL_PREFIX  = "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.13/cmake-install"
+CMAKE_INSTALL_PREFIX  = "C:/gitlabci/tools/builds/3zsqG5ns9/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.13/cmake-install"
 NG_INSTALL_DIR_PYTHON   = "."
 NG_INSTALL_DIR_BIN      = "netgen"
 NG_INSTALL_DIR_LIB      = "netgen/lib"
@@ -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.2504-11-gfea644ae"
-NETGEN_VERSION_GIT = "v6.2.2504-11-gfea644ae"
-NETGEN_VERSION_PYTHON = "6.2.2504.post11.dev0"
+NETGEN_VERSION = "6.2.2506-48-g8263c0bc"
+NETGEN_VERSION_GIT = "v6.2.2506-48-g8263c0bc"
+NETGEN_VERSION_PYTHON = "6.2.2506.post48.dev0"
 
 NETGEN_VERSION_MAJOR = "6"
 NETGEN_VERSION_MINOR = "2"
-NETGEN_VERSION_TWEAK = "11"
-NETGEN_VERSION_PATCH = "2504"
-NETGEN_VERSION_HASH = "gfea644ae"
+NETGEN_VERSION_TWEAK = "48"
+NETGEN_VERSION_PATCH = "2506"
+NETGEN_VERSION_HASH = "g8263c0bc"
 
 PYTHON_VERSION       = "3.13.2"
 PYTHON_VERSION_MAJOR = "3"

netgen/config/config.pyi

@@ -7,7 +7,7 @@ def get_cmake_dir():
 BUILD_FOR_CONDA: bool = True
 BUILD_STUB_FILES: bool = True
 CHECK_RANGE: bool = False
-CMAKE_INSTALL_PREFIX: str = 'C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.13/cmake-install'
+CMAKE_INSTALL_PREFIX: str = 'C:/gitlabci/tools/builds/3zsqG5ns9/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.13/cmake-install'
 DEBUG_LOG: bool = False
 ENABLE_CPP_CORE_GUIDELINES_CHECK: bool = False
 ENABLE_UNIT_TESTS: bool = False
@@ -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.2504-11-gfea644ae'
-NETGEN_VERSION_GIT: str = 'v6.2.2504-11-gfea644ae'
-NETGEN_VERSION_HASH: str = 'gfea644ae'
+NETGEN_VERSION: str = '6.2.2506-48-g8263c0bc'
+NETGEN_VERSION_GIT: str = 'v6.2.2506-48-g8263c0bc'
+NETGEN_VERSION_HASH: str = 'g8263c0bc'
 NETGEN_VERSION_MAJOR: str = '6'
 NETGEN_VERSION_MINOR: str = '2'
-NETGEN_VERSION_PATCH: str = '2504'
-NETGEN_VERSION_PYTHON: str = '6.2.2504.post11.dev0'
-NETGEN_VERSION_TWEAK: str = '11'
+NETGEN_VERSION_PATCH: str = '2506'
+NETGEN_VERSION_PYTHON: str = '6.2.2506.post48.dev0'
+NETGEN_VERSION_TWEAK: str = '48'
 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.2504-11-gfea644ae'
+version: str = 'v6.2.2506-48-g8263c0bc'

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,14 @@ namespace ngcore
     virtual Archive & operator & (std::string & str) = 0;
     virtual Archive & operator & (char *& str) = 0;
 
+#ifdef NETGEN_PYTHON    
+    Archive & operator &(std::any& a)
+    {
+      Shallow(a);
+      return *this;
+    }
+#endif
+    
     Archive & operator & (VersionInfo & version)
     {
         if(Output())
@@ -505,7 +518,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 +777,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/array.hpp

@@ -347,7 +347,7 @@ namespace ngcore
 
    */
   template <typename T>
-  auto Range(const T & x)
+  NETGEN_INLINE auto Range(const T & x)
     -> typename std::enable_if<std::is_integral_v<T> || !has_range<T>,
                                decltype(Range_impl(x, std::is_integral<T>()))>::type {
     return Range_impl(x, std::is_integral<T>());
@@ -455,11 +455,11 @@ namespace ngcore
     using BaseArrayObject<FlatArray>::ILLEGAL_POSITION;
 
     /// initialize array 
-    NETGEN_INLINE FlatArray () = default;
+    FlatArray () = default;
     // { ; } // size = 0; data = 0; }
 
     /// copy constructor allows size-type conversion 
-    NETGEN_INLINE FlatArray (const FlatArray & a2) = default;
+    FlatArray (const FlatArray & a2) = default;
     // : size(a2.Size()), data(a2.data) { ; } 
 
     /// provide size and memory
@@ -1442,8 +1442,24 @@ namespace ngcore
   template <class T, typename TLESS>
   void QuickSort (FlatArray<T> data, TLESS less)
   {
-    if (data.Size() <= 1) return;
+    constexpr size_t INSERTION_SORT_THRESHOLD = 16;
+    
+    if (data.Size() <= INSERTION_SORT_THRESHOLD) {
+      // insertion sort
+      for (ptrdiff_t k = 1; k < data.Size(); ++k)
+        {
+          auto newval = data[k];
+          ptrdiff_t l = k;
+          for ( ; l > 0 && less(newval, data[l-1]); --l)
+            data[l] = data[l-1];
+          data[l] = newval;
+        }
+      
+      return;
+    }
 
+    // if (data.Size() <= 1) return;
+    
     ptrdiff_t i = 0;
     ptrdiff_t j = data.Size()-1;
 

netgen/include/core/autodiff.hpp

@@ -9,7 +9,6 @@
 
 namespace ngcore
 {
-  using ngcore::IfPos;
 
 // Automatic differentiation datatype
 
@@ -247,7 +246,6 @@ NETGEN_INLINE AutoDiffVec<D,SCAL> operator* (const AutoDiffVec<D,SCAL> & x, cons
 }
 
 /// AutoDiffVec times AutoDiffVec
-using ngcore::sqr;
 template<int D, typename SCAL>
 NETGEN_INLINE AutoDiffVec<D,SCAL> sqr (const AutoDiffVec<D,SCAL> & x) throw()
 {
@@ -645,10 +643,10 @@ NETGEN_INLINE AutoDiffVec<D,SCAL> asin (AutoDiffVec<D,SCAL> x)
     SCAL last;
 
   public:
-    NETGEN_INLINE AutoDiffRec () = default;
-    NETGEN_INLINE AutoDiffRec (const AutoDiffRec &) = default;
+    AutoDiffRec () = default;
+    AutoDiffRec (const AutoDiffRec &) = default;
     NETGEN_INLINE AutoDiffRec (AutoDiffRec<D-1,SCAL> _rec, SCAL _last) : rec(_rec), last(_last) { ; }
-    NETGEN_INLINE AutoDiffRec & operator= (const AutoDiffRec &) = default;
+    AutoDiffRec & operator= (const AutoDiffRec &) = default;
 
     NETGEN_INLINE AutoDiffRec (SCAL aval) : rec(aval), last(0.0) { ; }
     NETGEN_INLINE AutoDiffRec (SCAL aval, int diffindex) : rec(aval, diffindex), last((diffindex==D-1) ? 1.0 : 0.0) { ; }
@@ -691,14 +689,14 @@ NETGEN_INLINE AutoDiffVec<D,SCAL> asin (AutoDiffVec<D,SCAL> x)
   {
     SCAL val;
   public:
-    NETGEN_INLINE AutoDiffRec () = default;
-    NETGEN_INLINE AutoDiffRec (const AutoDiffRec &) = default;
+    AutoDiffRec () = default;
+    AutoDiffRec (const AutoDiffRec &) = default;
     NETGEN_INLINE AutoDiffRec (SCAL _val) : val(_val) { ; }
     NETGEN_INLINE AutoDiffRec (SCAL _val, SCAL /* _dummylast */) : val(_val) { ; }
     NETGEN_INLINE AutoDiffRec (SCAL aval, const SCAL * /* grad */)
       : val(aval) { } 
 
-    NETGEN_INLINE AutoDiffRec & operator= (const AutoDiffRec &) = default;
+    AutoDiffRec & operator= (const AutoDiffRec &) = default;
     NETGEN_INLINE AutoDiffRec & operator= (SCAL aval) { val = aval; return *this; }
 
     NETGEN_INLINE SCAL Value() const { return val; }
@@ -719,8 +717,8 @@ NETGEN_INLINE AutoDiffVec<D,SCAL> asin (AutoDiffVec<D,SCAL> x)
     SCAL val;
     SCAL last;
   public:
-    NETGEN_INLINE AutoDiffRec () = default;
-    NETGEN_INLINE AutoDiffRec (const AutoDiffRec &) = default;
+    AutoDiffRec () = default;
+    AutoDiffRec (const AutoDiffRec &) = default;
     NETGEN_INLINE AutoDiffRec (SCAL _val) : val(_val), last(0.0) { ; }
     NETGEN_INLINE AutoDiffRec (SCAL _val, SCAL _last) : val(_val), last(_last) { ; }
     NETGEN_INLINE AutoDiffRec (SCAL aval, int diffindex) : val(aval), last((diffindex==0) ? 1.0 : 0.0) { ; }
@@ -733,7 +731,7 @@ NETGEN_INLINE AutoDiffVec<D,SCAL> asin (AutoDiffVec<D,SCAL> x)
       DValue(0) = ad.DValue(0);
     }
 
-    NETGEN_INLINE AutoDiffRec & operator= (const AutoDiffRec &) = default;
+    AutoDiffRec & operator= (const AutoDiffRec &) = default;
     NETGEN_INLINE AutoDiffRec & operator= (SCAL aval) { val = aval; last = 0.0; return *this; }
 
     NETGEN_INLINE SCAL Value() const { return val; }

netgen/include/core/autodiffdiff.hpp

@@ -9,8 +9,6 @@
 
 namespace ngcore
 {
-  using ngcore::IfPos;
-
 // Automatic second differentiation datatype
 
 

netgen/include/core/bitarray.hpp

@@ -155,7 +155,7 @@ public:
   
   NGCORE_API auto * Data() const { return data; }
 
-  const size_t GetMemoryUsage() const { return owns_data ? (size+CHAR_BIT-1)/CHAR_BIT : 0; }
+  size_t GetMemoryUsage() const { return owns_data ? (size+CHAR_BIT-1)/CHAR_BIT : 0; }
   const MemoryTracer& GetMemoryTracer() const { return mt; }
   void StartMemoryTracing() const
   {

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/hashtable.hpp

@@ -53,7 +53,7 @@ namespace ngcore
     
   public:
     ///
-    constexpr NETGEN_INLINE IVec () = default;
+    constexpr IVec () = default;
     constexpr NETGEN_INLINE IVec (const IVec & i1) : i(i1.i) { }
 
     constexpr NETGEN_INLINE IVec (T ai1) : i(ai1) { }

netgen/include/core/memtracer.hpp

@@ -198,17 +198,17 @@ namespace ngcore
     }
 #else // defined(NETGEN_TRACE_MEMORY) && !defined(__CUDA_ARCH__)
   public:
-    MemoryTracer() {}
-    MemoryTracer( std::string /* name */ ) {}
+    NETGEN_INLINE MemoryTracer() {}
+    NETGEN_INLINE MemoryTracer( std::string /* name */ ) {}
     template <typename... TRest>
-    MemoryTracer( std::string /* name */, TRest & ... ) {}
+    NETGEN_INLINE MemoryTracer( std::string /* name */, TRest & ... ) {}
 
-    void Alloc(size_t /* size */) const {}
-    void Free(size_t /* size */) const {}
-    int GetId() const { return 0; }
+    NETGEN_INLINE void Alloc(size_t /* size */) const {}
+    NETGEN_INLINE void Free(size_t /* size */) const {}
+    NETGEN_INLINE int GetId() const { return 0; }
 
     template <typename... TRest>
-    void Track(TRest&...) const {}
+    NETGEN_INLINE void Track(TRest&...) const {}
 
     static std::string GetName(int /* id */) { return ""; }
     std::string GetName() const { return ""; }

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/ngcore_api.hpp

@@ -39,6 +39,9 @@
 #ifdef WIN32
         #define NGCORE_API_EXPORT __declspec(dllexport)
         #define NGCORE_API_IMPORT __declspec(dllimport)
+#elif EMSCRIPTEN
+        #define NGCORE_API_EXPORT __attribute__((visibility("default"))) __attribute__((used))
+        #define NGCORE_API_IMPORT
 #else
         #define NGCORE_API_EXPORT __attribute__((visibility("default")))
         #define NGCORE_API_IMPORT __attribute__((visibility("default")))
@@ -57,6 +60,14 @@
   #define NETGEN_HD
 #endif // __CUDACC__
 
+
+#ifdef __CUDACC__
+// partial override of overloaded function (Archive, MultAdd)
+#pragma nv_diag_suppress 611
+#endif
+
+
+
 #ifdef __INTEL_COMPILER
   #define NETGEN_ALWAYS_INLINE __forceinline
   #define NETGEN_INLINE __forceinline inline

netgen/include/core/paje_trace.hpp

@@ -98,10 +98,11 @@ namespace ngcore
 
       struct TimerEvent
         {
-          int timer_id;
           TTimePoint time;
-          bool is_start;
+          int timer_id;
           int thread_id;
+          int custom_value = -1;
+          bool is_start;
 
           bool operator < (const TimerEvent & other) const { return time < other.time; }
         };
@@ -170,12 +171,12 @@ namespace ngcore
           if(!tracing_enabled) return;
           user_events.push_back(ue);
       }
-      void StartGPU(int timer_id = 0)
+      void StartGPU(int timer_id = 0, int user_value = -1)
         {
           if(!tracing_enabled) return;
           if(unlikely(gpu_events.size() == max_num_events_per_thread))
             StopTracing();
-          gpu_events.push_back(TimerEvent{timer_id, GetTimeCounter(), true});
+          gpu_events.push_back(TimerEvent{GetTimeCounter(), timer_id, 0, user_value, true});
         }
 
       void StopGPU(int timer_id)
@@ -183,15 +184,15 @@ namespace ngcore
           if(!tracing_enabled) return;
           if(unlikely(gpu_events.size() == max_num_events_per_thread))
             StopTracing();
-          gpu_events.push_back(TimerEvent{timer_id, GetTimeCounter(), false});
+          gpu_events.push_back(TimerEvent{GetTimeCounter(), timer_id, 0, -1, false});
         }
 
-      void StartTimer(int timer_id)
+      void StartTimer(int timer_id, int user_value = -1)
         {
           if(!tracing_enabled) return;
           if(unlikely(timer_events.size() == max_num_events_per_thread))
             StopTracing();
-          timer_events.push_back(TimerEvent{timer_id, GetTimeCounter(), true});
+          timer_events.push_back(TimerEvent{GetTimeCounter(), timer_id, 0, user_value, true});
         }
 
       void StopTimer(int timer_id)
@@ -199,7 +200,7 @@ namespace ngcore
           if(!tracing_enabled) return;
           if(unlikely(timer_events.size() == max_num_events_per_thread))
             StopTracing();
-          timer_events.push_back(TimerEvent{timer_id, GetTimeCounter(), false});
+          timer_events.push_back(TimerEvent{GetTimeCounter(), timer_id, 0, -1, false});
         }
 
       void AllocMemory(int id, size_t size)

netgen/include/core/profiler.hpp

@@ -202,21 +202,21 @@ namespace ngcore
     {
       Stop(TaskManager::GetThreadId());
     }
-    void Start (int tid) const
+    void Start (int tid, int trace_value = -1) const
     {
         if(tid==0)
         {
           if constexpr(do_timing)
             NgProfiler::StartTimer (timernr);
           if constexpr(do_tracing)
-            if(trace) trace->StartTimer(timernr);
+            if(trace) trace->StartTimer(timernr, trace_value);
         }
         else
         {
           if constexpr(do_timing)
             NgProfiler::StartThreadTimer(timernr, tid);
           if constexpr(do_tracing)
-            if(trace) trace->StartTask (tid, timernr, PajeTrace::Task::ID_TIMER);
+            if(trace) trace->StartTask (tid, timernr, PajeTrace::Task::ID_TIMER, trace_value);
         }
     }
     void Stop (int tid) const
@@ -262,10 +262,10 @@ namespace ngcore
     int tid;
   public:
     /// start timer
-    RegionTimer (const TTimer & atimer) : timer(atimer)
+    RegionTimer (const TTimer & atimer, int trace_value = -1) : timer(atimer)
     {
       tid = TaskManager::GetThreadId();
-      timer.Start(tid);
+      timer.Start(tid, trace_value);
     }
 
     /// stop timer

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.hpp

@@ -7,10 +7,12 @@
 /* Date:   25. Mar. 16                                                    */
 /**************************************************************************/
 
+#include <array>
+#include <tuple>
 #include "ngcore_api.hpp"
-
 #include "simd_generic.hpp"
 
+
 #ifndef __CUDA_ARCH__
 
 #ifdef NETGEN_ARCH_AMD64
@@ -87,6 +89,72 @@ namespace ngcore
     // return SIMD<double,4>(HSum(s1), HSum(s2), HSum(s3), HSum(s4));
     return SIMD<double,4>(HSum(s1, s2), HSum(s3,s4));
   }
+
+
+
+  template <typename T, size_t S> class MakeSimdCl;
+  
+  template <typename T, size_t S>
+  auto MakeSimd (std::array<T,S> aa)  { return MakeSimdCl(aa).Get(); }
+
+  
+  template <typename T, size_t S>
+  class MakeSimdCl
+  {
+    std::array<T,S> a;
+  public:
+    MakeSimdCl (std::array<T,S> aa) : a(aa)  { ; }
+    auto Get() const
+    {
+      SIMD<T,S> sa( [this] (auto i) { return (this->a)[i]; });
+      return sa;
+    }
+  };
+  
+
+  
+  
+  template <typename Tfirst, size_t S, typename ...Trest>
+  class MakeSimdCl<std::tuple<Tfirst,Trest...>,S>
+  {
+    std::array<std::tuple<Tfirst,Trest...>,S> a;
+  public:
+    MakeSimdCl (std::array<std::tuple<Tfirst,Trest...>,S> aa) : a(aa)  { ; }
+    auto Get() const
+    {
+      std::array<Tfirst,S> a0;
+      for (int i = 0; i < S; i++)
+        a0[i] = std::get<0> (a[i]);
+      
+      if constexpr (std::tuple_size<std::tuple<Tfirst,Trest...>>::value == 1)
+        {
+          return std::tuple(MakeSimd(a0));
+        }
+      else
+        {
+          std::array<std::tuple<Trest...>,S> arest;
+          for (int i = 0; i < S; i++)
+            arest[i] = skip_first(a[i]);
+          
+          return std::tuple_cat ( std::tuple (MakeSimd(a0)), MakeSimd(arest) );
+        }
+    }
+
+    template <typename... Ts>
+    static auto skip_first(const std::tuple<Ts...>& t) {
+      return std::apply([](auto first, auto... rest) {
+        return std::make_tuple(rest...);
+      }, t);
+    }
+  };
+  
+
+  
+
+  
 }
 
+
+#include "simd_math.hpp"
+
 #endif // NETGEN_CORE_SIMD_HPP