ngsolve 6.2.2506.post73.dev0__cp312-cp312-macosx_10_15_universal2.whl → 6.2.2506.post85.dev0__cp312-cp312-macosx_10_15_universal2.whl

netgen/include/sparsefactorization_interface.hpp

@@ -0,0 +1,153 @@
+#ifndef SPARSEFACTORIZATION_INTERFACE_HPP
+#define SPARSEFACTORIZATION_INTERFACE_HPP
+
+#include "basevector.hpp"
+#include "sparsecholesky.hpp"
+#include "sparsematrix.hpp"
+#include "../ngstd/python_ngstd.hpp"
+
+namespace ngla {
+
+  void ExportSparseFactorizationInterface(py::module &m);
+
+struct MapInnerDofs {
+  shared_ptr<BitArray> inner;
+  shared_ptr<const Array<int>> cluster;
+  Array<int> project;
+  Array<int> embed;
+  size_t size = 0;
+
+  MapInnerDofs(shared_ptr<BitArray> ainner,
+               shared_ptr<const Array<int>> acluster = nullptr)
+      : inner(ainner), cluster(acluster) {
+    if (!inner && !cluster) {
+      size = 0;
+      return;
+    }
+    if (inner) {
+      size = inner->NumSet();
+      project.SetSize(size);
+      embed.SetSize(inner->Size());
+      int j = 0;
+      for (int i = 0; i < inner->Size(); i++) {
+        if ((*inner)[i]) {
+          project[j] = i;
+          embed[i] = j++;
+        } else
+          embed[i] = -1;
+      }
+      return;
+    }
+
+    int j = 0;
+    for (int i = 0; i < cluster->Size(); i++) {
+      if ((*cluster)[i]) {
+        project.Append(i);
+        embed.Append(j++);
+      } else {
+        embed.Append(-1);
+      }
+    }
+    size = project.Size();
+  }
+
+  operator bool() const { return inner || cluster; }
+
+  template <typename T>
+  void Project(FlatVector<T> dst, FlatVector<T> src) const {
+    for (size_t i = 0; i < project.Size(); i++)
+      dst[i] = src[project[i]];
+  }
+
+  template <typename T> void Embed(T &dst, const T &src) const {
+    for (size_t i : Range(embed)) {
+      if (embed[i] >= 0)
+        dst[i] = src[embed[i]];
+      else
+        dst[i] = 0.0;
+    }
+  }
+
+  template <typename T>
+  void EmbedAdd(FlatVector<T> dst, FlatVector<T> src, T scale) const {
+    for (size_t i : Range(embed))
+      if (embed[i] >= 0)
+        dst[i] += scale * src[embed[i]];
+  }
+
+  template <typename T>
+  shared_ptr<SparseMatrixTM<T>>
+  ProjectMatrix(shared_ptr<const SparseMatrixTM<T>> m) {
+    Array<int> rowi, coli;
+    Array<T> vals;
+    auto &dofs = *inner;
+
+    auto vals_ori = m->GetValues();
+
+    auto &cluster_array = *cluster;
+    auto &inner_bitarray = *inner;
+    auto is_used = [this, &inner_bitarray, &cluster_array](int i, int j) {
+      if (inner)
+        return inner_bitarray[i] && inner_bitarray[j];
+      return cluster_array[i] == cluster_array[j];
+    };
+
+    for (auto i : project)
+      for (auto j : m->GetRowIndices(i))
+        if (is_used(i, j)) {
+          rowi.Append(embed[i]);
+          coli.Append(embed[j]);
+          vals.Append(vals_ori[m->GetPosition(i, j)]);
+        }
+
+    auto res = SparseMatrixTM<T>::CreateFromCOO(rowi, coli, vals,
+                                                project.Size(), project.Size());
+    res->SetSPD(m->IsSPD());
+    return res;
+  }
+};
+
+class SparseFactorizationInterface : public SparseFactorization {
+protected:
+  shared_ptr<const BaseSparseMatrix> inner_mat;
+  shared_ptr<BaseVector> inner_rhs, inner_solution;
+  MapInnerDofs map_inner_dofs;
+  bool is_complex = false;
+  bool is_symmetric = false;
+  bool is_symmetric_storage = false;
+  bool is_analyzed = false;
+  int width, height, inner_width, inner_height;
+
+public:
+  SparseFactorizationInterface() = delete;
+  SparseFactorizationInterface(shared_ptr<const BaseMatrix> m,
+                               shared_ptr<BitArray> ainner = nullptr,
+                               shared_ptr<const Array<int>> acluster = nullptr);
+
+  virtual ~SparseFactorizationInterface() {}
+
+  AutoVector CreateRowVector() const override {
+    return make_unique<VVector<double>>(Width());
+  }
+
+  AutoVector CreateColVector() const override {
+    return make_unique<VVector<double>>(Height());
+  }
+
+  shared_ptr<const BaseSparseMatrix> GetInnerMatrix() const {
+    return inner_mat;
+  }
+
+  void MultAdd(double s, const BaseVector &x, BaseVector &y) const override;
+  void MultAdd(Complex s, const BaseVector &x, BaseVector &y) const override;
+
+  virtual void Update() override;
+
+  virtual void Analyze() {}
+  virtual void Factor() {}
+  virtual void Solve(const BaseVector &rhs, BaseVector &solution) const = 0;
+};
+
+} // namespace ngla
+
+#endif // SPARSEFACTORIZATION_INTERFACE_HPP

netgen/include/statushandler.hpp

@@ -3,27 +3,27 @@
 
 namespace ngstd
 {
-
+  
   /** Access to statusbar. (and more)
    */
 
   class NGS_DLL_HEADER BaseStatusHandler
-  {
-  public:
-    static void PushStatus (const char * str);
+    {
+    public:
+    static void PushStatus (const std::string& str);
     static void PopStatus ();
     static void SetThreadPercentage (double percent);
-
+    
     static void GetStatus (string & str, double & percent);
-
+    
     static void SetTerminate(void);
     static void UnSetTerminate(void);
     static bool ShouldTerminate(void);
-
+    
     class Region
     {
     public:
-      Region(const char * str) { PushStatus(str); }
+      Region(const string& str) { PushStatus(str); }
       ~Region() { PopStatus(); }
     };
   };

ngsolve/__init__.pyi

@@ -16,18 +16,15 @@ from builtins import sum as builtin_sum
 import netgen as netgen
 from netgen import Redraw
 from netgen import TimeFunction
-from ngsolve.bla import InnerProduct
-from ngsolve.bla import Matrix
-from ngsolve.bla import Norm
-from ngsolve.bla import Vector
+from ngsolve.bla.pybind11_detail_function_record_v1_system_libcpp_abi1 import InnerProduct
+from ngsolve.bla.pybind11_detail_function_record_v1_system_libcpp_abi1 import Matrix
+from ngsolve.bla.pybind11_detail_function_record_v1_system_libcpp_abi1 import Norm
+from ngsolve.bla.pybind11_detail_function_record_v1_system_libcpp_abi1 import Vector
 from ngsolve.comp import APhiHCurlAMG
 from ngsolve.comp import BilinearForm
-from ngsolve.comp import BoundaryFromVolumeCF
 from ngsolve.comp import COUPLING_TYPE
 from ngsolve.comp import Compress
-from ngsolve.comp import CompressCompound
 from ngsolve.comp import ContactBoundary
-from ngsolve.comp import ConvertOperator
 from ngsolve.comp import Discontinuous
 from ngsolve.comp import ElementId
 from ngsolve.comp import FESpace
@@ -46,8 +43,6 @@ from ngsolve.comp import HDivDivSurface
 from ngsolve.comp import HDivSurface
 from ngsolve.comp import Hidden
 from ngsolve.comp import Hidden as PrivateSpace
-from ngsolve.comp import Integrate
-from ngsolve.comp import Interpolate
 from ngsolve.comp import L2
 from ngsolve.comp import LinearForm
 from ngsolve.comp import MatrixValued
@@ -59,18 +54,12 @@ from ngsolve.comp import NormalFacetFESpace
 from ngsolve.comp import NormalFacetSurface
 from ngsolve.comp import NumberSpace
 from ngsolve.comp import ORDER_POLICY
-from ngsolve.comp import PatchwiseSolve
 from ngsolve.comp import Periodic
 from ngsolve.comp import PlateauFESpace
 from ngsolve.comp import Preconditioner
 from ngsolve.comp import ProductSpace
 from ngsolve.comp import Region
-from ngsolve.comp import SetHeapSize
-from ngsolve.comp import SetTestoutFile
 from ngsolve.comp import SurfaceL2
-from ngsolve.comp import SymbolicBFI
-from ngsolve.comp import SymbolicEnergy
-from ngsolve.comp import SymbolicLFI
 from ngsolve.comp import TangentialFacetFESpace
 from ngsolve.comp import TangentialSurfaceL2
 from ngsolve.comp import VTKOutput
@@ -83,70 +72,81 @@ from ngsolve.comp import VectorNodalFESpace
 from ngsolve.comp import VectorSurfaceL2
 from ngsolve.comp import VectorValued
 from ngsolve.comp import pml
+from ngsolve.comp.pybind11_detail_function_record_v1_system_libcpp_abi1 import BoundaryFromVolumeCF
+from ngsolve.comp.pybind11_detail_function_record_v1_system_libcpp_abi1 import CompressCompound
+from ngsolve.comp.pybind11_detail_function_record_v1_system_libcpp_abi1 import ConvertOperator
+from ngsolve.comp.pybind11_detail_function_record_v1_system_libcpp_abi1 import Integrate
+from ngsolve.comp.pybind11_detail_function_record_v1_system_libcpp_abi1 import Interpolate
+from ngsolve.comp.pybind11_detail_function_record_v1_system_libcpp_abi1 import PatchwiseSolve
+from ngsolve.comp.pybind11_detail_function_record_v1_system_libcpp_abi1 import SetHeapSize
+from ngsolve.comp.pybind11_detail_function_record_v1_system_libcpp_abi1 import SetTestoutFile
+from ngsolve.comp.pybind11_detail_function_record_v1_system_libcpp_abi1 import SymbolicBFI
+from ngsolve.comp.pybind11_detail_function_record_v1_system_libcpp_abi1 import SymbolicEnergy
+from ngsolve.comp.pybind11_detail_function_record_v1_system_libcpp_abi1 import SymbolicLFI
 from ngsolve.fem import BFI
 from ngsolve.fem import BSpline
-from ngsolve.fem import BlockBFI
-from ngsolve.fem import BlockLFI
-from ngsolve.fem import CacheCF
-from ngsolve.fem import CoefficientFunction
 from ngsolve.fem import CoefficientFunction as CF
-from ngsolve.fem import Cof
-from ngsolve.fem import CompoundBFI
-from ngsolve.fem import CompoundLFI
-from ngsolve.fem import Conj
-from ngsolve.fem import Cross
-from ngsolve.fem import Det
+from ngsolve.fem import CoefficientFunction
 from ngsolve.fem import ET
-from ngsolve.fem import Id
-from ngsolve.fem import IfPos
 from ngsolve.fem import IntegrationRule
-from ngsolve.fem import Inv
 from ngsolve.fem import LFI
 from ngsolve.fem import Parameter
 from ngsolve.fem import ParameterC
 from ngsolve.fem import PlaceholderCF
-from ngsolve.fem import Skew
-from ngsolve.fem import Sym
-from ngsolve.fem import Trace
-from ngsolve.fem import VoxelCoefficient
-from ngsolve.fem import Zero as ZeroCF
-from ngsolve.fem import acos
-from ngsolve.fem import asin
-from ngsolve.fem import atan
-from ngsolve.fem import atan2
-from ngsolve.fem import ceil
-from ngsolve.fem import cos
-from ngsolve.fem import cosh
-from ngsolve.fem import erf
-from ngsolve.fem import exp
-from ngsolve.fem import floor
-from ngsolve.fem import log
-from ngsolve.fem import pow
-from ngsolve.fem import sin
-from ngsolve.fem import sinh
-from ngsolve.fem import sqrt
-from ngsolve.fem import tan
-from ngsolve.la import ArnoldiSolver
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import BlockBFI
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import BlockLFI
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import CacheCF
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import Cof
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import CompoundBFI
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import CompoundLFI
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import Conj
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import Cross
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import Det
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import Id
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import IfPos
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import Inv
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import Skew
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import Sym
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import Trace
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import VoxelCoefficient
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import Zero as ZeroCF
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import acos
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import asin
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import atan
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import atan2
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import ceil
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import cos
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import cosh
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import erf
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import exp
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import floor
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import log
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import pow
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import sin
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import sinh
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import sqrt
+from ngsolve.fem.pybind11_detail_function_record_v1_system_libcpp_abi1 import tan
 from ngsolve.la import BaseMatrix
 from ngsolve.la import BaseVector
 from ngsolve.la import BlockMatrix
 from ngsolve.la import BlockVector
-from ngsolve.la import CGSolver
 from ngsolve.la import ConstEBEMatrix
-from ngsolve.la import CreateVVector
 from ngsolve.la import DiagonalMatrix
 from ngsolve.la import Embedding
-from ngsolve.la import GMRESSolver
 from ngsolve.la import IdentityMatrix
 from ngsolve.la import MultiVector
 from ngsolve.la import PARALLEL_STATUS
 from ngsolve.la import ParallelMatrix
 from ngsolve.la import PermutationMatrix
 from ngsolve.la import Projector
-from ngsolve.la import QMRSolver
+from ngsolve.la.pybind11_detail_function_record_v1_system_libcpp_abi1 import ArnoldiSolver
+from ngsolve.la.pybind11_detail_function_record_v1_system_libcpp_abi1 import CGSolver
+from ngsolve.la.pybind11_detail_function_record_v1_system_libcpp_abi1 import CreateVVector
+from ngsolve.la.pybind11_detail_function_record_v1_system_libcpp_abi1 import GMRESSolver
+from ngsolve.la.pybind11_detail_function_record_v1_system_libcpp_abi1 import QMRSolver
 from ngsolve.ngstd import IntRange
-from ngsolve.solve import Draw
-from ngsolve.solve import SetVisualization
+from ngsolve.solve.pybind11_detail_function_record_v1_system_libcpp_abi1 import Draw
+from ngsolve.solve.pybind11_detail_function_record_v1_system_libcpp_abi1 import SetVisualization
 from ngsolve.solve_implementation.Application import Solve
 from ngsolve.timing import Timing
 from ngsolve.utils import Deviator
@@ -168,10 +168,10 @@ from ngsolve.utils import printonce
 import os as os
 from pyngcore.pyngcore import BitArray
 from pyngcore.pyngcore import PajeTrace
-from pyngcore.pyngcore import SetNumThreads
 from pyngcore.pyngcore import TaskManager
 from pyngcore.pyngcore import Timer
-from pyngcore.pyngcore import Timers
+from pyngcore.pyngcore.pybind11_detail_function_record_v1_system_libcpp_abi1 import SetNumThreads
+from pyngcore.pyngcore.pybind11_detail_function_record_v1_system_libcpp_abi1 import Timers
 import sys as sys
 from . import bla
 from . import bvp
@@ -219,7 +219,7 @@ TET: fem.ET  # value = <ET.TET: 20>
 TRIG: fem.ET  # value = <ET.TRIG: 10>
 VERTEX: fem.NODE_TYPE  # value = <NODE_TYPE.VERTEX: 0>
 VOL: comp.VorB  # value = <VorB.VOL: 0>
-__version__: str = '6.2.2506-73-g12fb35d80'
+__version__: str = '6.2.2506-85-g5e4fc20dd'
 ds: comp.DifferentialSymbol  # value = <ngsolve.comp.DifferentialSymbol object>
 dx: comp.DifferentialSymbol  # value = <ngsolve.comp.DifferentialSymbol object>
 ngsglobals: comp.GlobalVariables  # value = <ngsolve.comp.GlobalVariables object>