ngsolve 6.2.2506.post60.dev0__cp311-cp311-macosx_10_15_universal2.whl → 6.2.2506.post85.dev0__cp311-cp311-macosx_10_15_universal2.whl

netgen/include/kernels.hpp

@@ -94,14 +94,14 @@ namespace ngsbem
     
     Array<KernelTerm> terms;
     
-    auto CreateMultipoleExpansion (Vec<3> c, double r) const
+    auto CreateMultipoleExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<SingularMLExpansion<mp_type>> (c, r, 1e-16);
+      return make_shared<SingularMLExpansion<mp_type>> (c, r, 1e-16, fmm_params);
     }
 
-    auto CreateLocalExpansion (Vec<3> c, double r) const
+    auto CreateLocalExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<RegularMLExpansion<mp_type>> (c, r, 1e-16);
+      return make_shared<RegularMLExpansion<mp_type>> (c, r, 1e-16, fmm_params);
     }
 
     void AddSource (SingularMLExpansion<mp_type> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<double> val) const
@@ -157,14 +157,14 @@ namespace ngsbem
 
     Array<KernelTerm> terms;
 
-    auto CreateMultipoleExpansion (Vec<3> c, double r) const
+    auto CreateMultipoleExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<SingularMLExpansion<mp_type>> (c, r, 1e-16);
+      return make_shared<SingularMLExpansion<mp_type>> (c, r, 1e-16, fmm_params);
     }
 
-    auto CreateLocalExpansion (Vec<3> c, double r) const
+    auto CreateLocalExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<RegularMLExpansion<mp_type>> (c, r, 1e-16);
+      return make_shared<RegularMLExpansion<mp_type>> (c, r, 1e-16, fmm_params);
     }
 
     void AddSource (SingularMLExpansion<mp_type> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<double> val) const
@@ -231,14 +231,14 @@ namespace ngsbem
     double GetKappa() const { return kappa; }
     Array<KernelTerm> terms = { KernelTerm{1.0, 0, 0, 0}, };    
 
-    auto CreateMultipoleExpansion (Vec<3> c, double r) const
+    auto CreateMultipoleExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<SingularMLExpansion<Complex>> (c, r, kappa);
+      return make_shared<SingularMLExpansion<Complex>> (c, r, kappa, fmm_params);
     }
 
-    auto CreateLocalExpansion (Vec<3> c, double r) const
+    auto CreateLocalExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<RegularMLExpansion<Complex>> (c, r, kappa);
+      return make_shared<RegularMLExpansion<Complex>> (c, r, kappa, fmm_params);
     }
 
     void AddSource (SingularMLExpansion<Complex> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<Complex> val) const
@@ -285,14 +285,14 @@ namespace ngsbem
     double GetKappa() const { return kappa; }
     Array<KernelTerm> terms = { KernelTerm{1.0, 0, 0, 0}, };    
 
-    auto CreateMultipoleExpansion (Vec<3> c, double r) const
+    auto CreateMultipoleExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<SingularMLExpansion<Complex>> (c, r, kappa);
+      return make_shared<SingularMLExpansion<Complex>> (c, r, kappa, fmm_params);
     }
 
-    auto CreateLocalExpansion (Vec<3> c, double r) const
+    auto CreateLocalExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<RegularMLExpansion<Complex>> (c, r, kappa);
+      return make_shared<RegularMLExpansion<Complex>> (c, r, kappa, fmm_params);
     }
 
     void AddSource (SingularMLExpansion<Complex> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<Complex> val) const
@@ -345,14 +345,14 @@ namespace ngsbem
         KernelTerm{1.0, 0, 2, 2},
       };
 
-    auto CreateMultipoleExpansion (Vec<3> c, double r) const
+    auto CreateMultipoleExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<SingularMLExpansion<Vec<3,Complex>>> (c, r, kappa);
+      return make_shared<SingularMLExpansion<Vec<3,Complex>>> (c, r, kappa, fmm_params);
     }
 
-    auto CreateLocalExpansion (Vec<3> c, double r) const
+    auto CreateLocalExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<RegularMLExpansion<Vec<3,Complex>>> (c, r, kappa);
+      return make_shared<RegularMLExpansion<Vec<3,Complex>>> (c, r, kappa, fmm_params);
     }
 
     void AddSource (SingularMLExpansion<Vec<3,Complex>> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<Complex> val) const
@@ -398,14 +398,14 @@ namespace ngsbem
 	KernelTerm{1.0, 1, 3, 3},
       };
 
-    auto CreateMultipoleExpansion (Vec<3> c, double r) const
+    auto CreateMultipoleExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<SingularMLExpansion<Vec<6,Complex>>> (c, r, kappa);
+      return make_shared<SingularMLExpansion<Vec<6,Complex>>> (c, r, kappa, fmm_params);
     }
  
-    auto CreateLocalExpansion (Vec<3> c, double r) const
+    auto CreateLocalExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<RegularMLExpansion<Vec<6,Complex>>> (c, r, kappa);
+      return make_shared<RegularMLExpansion<Vec<6,Complex>>> (c, r, kappa, fmm_params);
     }
 
     void AddSource (SingularMLExpansion<Vec<6,Complex>> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<Complex> val) const
@@ -461,14 +461,14 @@ namespace ngsbem
     double GetKappa() const { return kappa; }
     Array<KernelTerm> terms = { KernelTerm{1.0, 0, 0, 0}, };    
 
-    auto CreateMultipoleExpansion (Vec<3> c, double r) const
+    auto CreateMultipoleExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<SingularMLExpansion<Complex>> (c, r, kappa);
+      return make_shared<SingularMLExpansion<Complex>> (c, r, kappa, fmm_params);
     }
 
-    auto CreateLocalExpansion (Vec<3> c, double r) const
+    auto CreateLocalExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<RegularMLExpansion<Complex>> (c, r, kappa);
+      return make_shared<RegularMLExpansion<Complex>> (c, r, kappa, fmm_params);
     }
 
     void AddSource (SingularMLExpansion<Complex> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<Complex> val) const
@@ -519,14 +519,14 @@ namespace ngsbem
     double GetKappa() const { return kappa; }
     Array<KernelTerm> terms;
 
-    auto CreateMultipoleExpansion (Vec<3> c, double r) const
+    auto CreateMultipoleExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<SingularMLExpansion<Vec<4,Complex>>> (c, r, kappa);
+      return make_shared<SingularMLExpansion<Vec<4,Complex>>> (c, r, kappa, fmm_params);
     }
 
-    auto CreateLocalExpansion (Vec<3> c, double r) const
+    auto CreateLocalExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<RegularMLExpansion<Vec<4,Complex>>> (c, r, kappa);
+      return make_shared<RegularMLExpansion<Vec<4,Complex>>> (c, r, kappa, fmm_params);
     }
 
     void AddSource (SingularMLExpansion<Vec<4,Complex>> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<Complex> val) const
@@ -586,14 +586,14 @@ namespace ngsbem
         KernelTerm{-1.0, 2, 1, 0},
       };    
 
-    auto CreateMultipoleExpansion (Vec<3> c, double r) const
+    auto CreateMultipoleExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<SingularMLExpansion<Vec<3,Complex>>> (c, r, kappa);
+      return make_shared<SingularMLExpansion<Vec<3,Complex>>> (c, r, kappa, fmm_params);
     }
 
-    auto CreateLocalExpansion (Vec<3> c, double r) const
+    auto CreateLocalExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<RegularMLExpansion<Vec<3,Complex>>> (c, r, kappa);
+      return make_shared<RegularMLExpansion<Vec<3,Complex>>> (c, r, kappa, fmm_params);
     }
 
     void AddSource (SingularMLExpansion<Vec<3,Complex>> & mp, Vec<3> pnt, Vec<3> nv, BareSliceVector<Complex> val) const
@@ -700,14 +700,14 @@ namespace ngsbem
     }
 
     
-    auto CreateMultipoleExpansion (Vec<3> c, double r) const
+    auto CreateMultipoleExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<SingularMLExpansion<Vec<6,Complex>>> (c, r, 1e-16);
+      return make_shared<SingularMLExpansion<Vec<6,Complex>>> (c, r, 1e-16, fmm_params);
     }
 
-    auto CreateLocalExpansion (Vec<3> c, double r) const
+    auto CreateLocalExpansion (Vec<3> c, double r, FMM_Parameters fmm_params) const
     {
-      return make_shared<RegularMLExpansion<Vec<6,Complex>>> (c, r, 1e-16);
+      return make_shared<RegularMLExpansion<Vec<6,Complex>>> (c, r, 1e-16, fmm_params);
     }
 
     

netgen/include/mp_coefficient.hpp

@@ -119,9 +119,9 @@ namespace ngsbem
     shared_ptr<RegularMLExpansion<entry_type>> mlmp;
   public:
     RegularMLExpansionCF (shared_ptr<SingularMLExpansionCF<entry_type>> asingmp, Vec<3> center, double r)
-      : CoefficientFunction(sizeof(entry_type)/sizeof(Complex), true), mlmp{make_shared<RegularMLExpansion<entry_type>>(asingmp->MLExpansion(), center, r)} { } 
+      : CoefficientFunction(sizeof(entry_type)/sizeof(Complex), true), mlmp{make_shared<RegularMLExpansion<entry_type>>(asingmp->MLExpansion(), center, r, FMM_Parameters())} { } 
     RegularMLExpansionCF (shared_ptr<SingularMLExpansion<entry_type>> asingmp, Vec<3> center, double r)
-      : CoefficientFunction(sizeof(entry_type)/sizeof(Complex), true), mlmp{make_shared<RegularMLExpansion<entry_type>>(asingmp, center, r)} { } 
+      : CoefficientFunction(sizeof(entry_type)/sizeof(Complex), true), mlmp{make_shared<RegularMLExpansion<entry_type>>(asingmp, center, r, FMM_Parameters())} { } 
     
     virtual double Evaluate (const BaseMappedIntegrationPoint & ip) const override
     { throw Exception("real eval not available"); }

netgen/include/mptools.hpp

@@ -58,6 +58,15 @@ namespace ngsbem
   
 
 
+  class FMM_Parameters
+  {
+  public:
+    int maxdirect = 100;
+    int minorder = 20;    // order = minorder + 2 kappa r 
+  };
+
+
+  
   
   inline std::tuple<double, double, double> SphericalCoordinates(Vec<3> dist){
     double len, theta, phi;
@@ -516,12 +525,14 @@ namespace ngsbem
 
   // ***************** parameters ****************
 
+  /*
   static constexpr int MPOrder (double rho_kappa)
   {
     // return max (20, int(2*rho_kappa));
     return 20+int(2*rho_kappa);
   }
   static constexpr int maxdirect = 100;
+  */
 
 
   template <typename SCAL, auto S>
@@ -665,11 +676,13 @@ namespace ngsbem
                   Vec<3,SIMD<double,FMM_SW>>, simd_entry_type>> simd_chargedipoles;
       
       int total_sources;
+      const FMM_Parameters & fmm_params;
       std::mutex node_mutex;
       atomic<bool> have_childs{false};
       
-      Node (Vec<3> acenter, double ar, int alevel, double akappa)
-        : center(acenter), r(ar), level(alevel), mp(MPOrder(ar*akappa), akappa, ar) // min(1.0, ar*akappa))
+      Node (Vec<3> acenter, double ar, int alevel, double akappa, const FMM_Parameters & afmm_params)
+      // : center(acenter), r(ar), level(alevel), mp(MPOrder(ar*akappa), akappa, ar), fmm_params(afmm_params)
+        : center(acenter), r(ar), level(alevel), mp(afmm_params.minorder+2*ar*akappa, akappa, ar), fmm_params(afmm_params)
       {
         if (level < nodes_on_level.Size())
           nodes_on_level[level]++;
@@ -693,7 +706,7 @@ namespace ngsbem
             cc(0) += (i&1) ? r/2 : -r/2;
             cc(1) += (i&2) ? r/2 : -r/2;
             cc(2) += (i&4) ? r/2 : -r/2;
-            childs[i] = make_unique<Node> (cc, r/2, level+1, mp.Kappa());
+            childs[i] = make_unique<Node> (cc, r/2, level+1, mp.Kappa(), fmm_params);
           }
         have_childs = true;
       }
@@ -742,7 +755,7 @@ namespace ngsbem
 
         // if (r*mp.Kappa() < 1e-8) return;
         if (level > 20) return;
-        if (charges.Size() < maxdirect && r*mp.Kappa() < 5)
+        if (charges.Size() < fmm_params.maxdirect && r*mp.Kappa() < 5)
           return;
         
         SendSourcesToChilds();
@@ -772,7 +785,7 @@ namespace ngsbem
         dipoles.Append (tuple{x,d,c});
         
         if (level > 20) return;
-        if (dipoles.Size() < maxdirect)
+        if (dipoles.Size() < fmm_params.maxdirect)
           return;
 
         SendSourcesToChilds();
@@ -801,7 +814,7 @@ namespace ngsbem
         
         chargedipoles.Append (tuple{x,c,dir,c2});
 
-        if (chargedipoles.Size() < maxdirect || r < 1e-8)
+        if (chargedipoles.Size() < fmm_params.maxdirect || r < 1e-8)
           return;
 
         SendSourcesToChilds();
@@ -1269,12 +1282,13 @@ namespace ngsbem
       }
     };
     
-    Node root;
+    FMM_Parameters fmm_params;
+    Node root;    
     bool havemp = false;
     
   public:
-    SingularMLExpansion (Vec<3> center, double r, double kappa)
-      : root(center, r, 0, kappa)
+    SingularMLExpansion (Vec<3> center, double r, double kappa, FMM_Parameters _params = FMM_Parameters())
+      : fmm_params(_params), root(center, r, 0, kappa, fmm_params)
     {
       nodes_on_level = 0;
       nodes_on_level[0] = 1;
@@ -1661,11 +1675,13 @@ namespace ngsbem
       atomic<bool> have_childs{false};
 
       Array<const typename SingularMLExpansion<elem_type>::Node*> singnodes;
+      const FMM_Parameters & params;
 
-      Node (Vec<3> acenter, double ar, int alevel, double kappa)
+      
+      Node (Vec<3> acenter, double ar, int alevel, double kappa, const FMM_Parameters & _params)
         : center(acenter), r(ar), level(alevel),
           // mp(MPOrder(ar*kappa), kappa, ar) // 1.0/min(1.0, 0.25*r*kappa))
-          mp(-1, kappa, ar)
+          mp(-1, kappa, ar), params(_params)
           // : center(acenter), r(ar), level(alevel), mp(MPOrder(ar*kappa), kappa, 1.0)
       {
         if (level < nodes_on_level.Size())
@@ -1674,7 +1690,8 @@ namespace ngsbem
 
       void Allocate()
       {
-        mp = SphericalExpansion<Regular,elem_type>(MPOrder(r*mp.Kappa()), mp.Kappa(), r);
+        // mp = SphericalExpansion<Regular,elem_type>(MPOrder(r*mp.Kappa()), mp.Kappa(), r);
+        mp = SphericalExpansion<Regular,elem_type>(params.minorder+2*r*mp.Kappa(), mp.Kappa(), r);        
       }
       
       
@@ -1688,7 +1705,7 @@ namespace ngsbem
             cc(0) += (i&1) ? r/2 : -r/2;
             cc(1) += (i&2) ? r/2 : -r/2;
             cc(2) += (i&4) ? r/2 : -r/2;
-            childs[i] = make_unique<Node> (cc, r/2, level+1, mp.Kappa());
+            childs[i] = make_unique<Node> (cc, r/2, level+1, mp.Kappa(), params);
             if (allocate)
               childs[i] -> Allocate();
           }
@@ -1909,7 +1926,7 @@ namespace ngsbem
 
         // if (r*mp.Kappa() < 1e-8) return;
         if (level > 20) return;        
-        if (targets.Size() < maxdirect && r*mp.Kappa() < 5)
+        if (targets.Size() < params.maxdirect && r*mp.Kappa() < 5)
           return;
 
         CreateChilds();
@@ -1949,7 +1966,7 @@ namespace ngsbem
         vol_targets.Append (tuple(x,tr));
 
         if (level > 20) return;
-        if (vol_targets.Size() < maxdirect && (r*mp.Kappa() < 5))
+        if (vol_targets.Size() < params.maxdirect && (r*mp.Kappa() < 5))
           return;
 
         CreateChilds();
@@ -2018,14 +2035,16 @@ namespace ngsbem
       }
 
     };
-    
+
+    FMM_Parameters fmm_params;
     Node root;
     shared_ptr<SingularMLExpansion<elem_type>> singmp;
     
   public:
-  RegularMLExpansion (shared_ptr<SingularMLExpansion<elem_type>> asingmp, Vec<3> center, double r)
-      : root(center, r, 0, asingmp->Kappa()), singmp(asingmp)
-    {
+  RegularMLExpansion (shared_ptr<SingularMLExpansion<elem_type>> asingmp, Vec<3> center, double r,
+                      const FMM_Parameters & _params)
+  : fmm_params(_params), root(center, r, 0, asingmp->Kappa(), fmm_params), singmp(asingmp)
+  {
       if (!singmp->havemp) throw Exception("first call Calc for singular MP");
       root.Allocate();
       
@@ -2054,13 +2073,13 @@ namespace ngsbem
       }
     }
 
-    RegularMLExpansion (Vec<3> center, double r, double kappa)
-      : root(center, r, 0, kappa)
-    {
-      nodes_on_level = 0;
-      nodes_on_level[0] = 1;
-    }
-    
+  RegularMLExpansion (Vec<3> center, double r, double kappa, const FMM_Parameters & _params)
+  : fmm_params(_params), root(center, r, 0, kappa, fmm_params)
+  {
+    nodes_on_level = 0;
+    nodes_on_level[0] = 1;
+  }
+  
     void AddTarget (Vec<3> t)
     {
       root.AddTarget (t);

netgen/include/preconditioner.hpp

@@ -414,7 +414,7 @@ namespace ngcomp
     ///
     // MGPreconditioner * low_order_preconditioner;
     ///
-    shared_ptr<Preconditioner> coarse_pre;
+    shared_ptr<BaseMatrix> coarse_pre;
     ///
     int finesmoothingsteps;
     ///
@@ -462,7 +462,7 @@ namespace ngcomp
     void MgTest () const;
 
     void SetDirectSolverCluster(shared_ptr<Array<int>> cluster);
-    void SetCoarsePreconditioner(shared_ptr<Preconditioner> prec);
+    void SetCoarsePreconditioner(shared_ptr<BaseMatrix> prec);
   };
 
   class CommutingAMGPreconditioner : public Preconditioner

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/cmake/NGSolveConfig.cmake

@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION "6.2.2506-60-g1d0a21976")
+set(PACKAGE_VERSION "6.2.2506-85-g5e4fc20dd")
 find_package(Netgen CONFIG REQUIRED HINTS
   ${CMAKE_CURRENT_LIST_DIR}
   ${CMAKE_CURRENT_LIST_DIR}/..

ngsolve/cmake/ngsolve-targets.cmake

@@ -19,7 +19,7 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
 set(_cmake_targets_defined "")
 set(_cmake_targets_not_defined "")
 set(_cmake_expected_targets "")
-foreach(_cmake_expected_target IN ITEMS netgen_libs ngs_lapack ngstd ngbla ngla ngfem ngsbem ngcomp ngsolve)
+foreach(_cmake_expected_target IN ITEMS netgen_lib netgen_core_lib ngs_lapack ngstd ngbla ngla ngfem ngsbem ngcomp ngsolve)
   list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
   if(TARGET "${_cmake_expected_target}")
     list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
@@ -54,11 +54,18 @@ if(_IMPORT_PREFIX STREQUAL "/")
   set(_IMPORT_PREFIX "")
 endif()
 
-# Create imported target netgen_libs
-add_library(netgen_libs INTERFACE IMPORTED)
+# Create imported target netgen_lib
+add_library(netgen_lib INTERFACE IMPORTED)
 
-set_target_properties(netgen_libs PROPERTIES
-  INTERFACE_LINK_LIBRARIES "nglib;ngcore"
+set_target_properties(netgen_lib PROPERTIES
+  INTERFACE_LINK_LIBRARIES "nglib"
+)
+
+# Create imported target netgen_core_lib
+add_library(netgen_core_lib INTERFACE IMPORTED)
+
+set_target_properties(netgen_core_lib PROPERTIES
+  INTERFACE_LINK_LIBRARIES "ngcore"
 )
 
 # Create imported target ngs_lapack
@@ -74,7 +81,7 @@ add_library(ngstd SHARED IMPORTED)
 set_target_properties(ngstd PROPERTIES
   INTERFACE_COMPILE_DEFINITIONS "HAVE_NETGEN_SOURCES;HAVE_DLFCN_H;HAVE_CXA_DEMANGLE;USE_TIMEOFDAY;MSG_NOSIGNAL=0;TCL;LAPACK;NGS_PYTHON;USE_UMFPACK"
   INTERFACE_COMPILE_OPTIONS "\$<\$<COMPILE_LANGUAGE:CXX>:-std=c++17>;\$<\$<COMPILE_LANGUAGE:CXX>:-Wno-undefined-var-template;-Wno-vla-extension>;-DMAX_SYS_DIM=3"
-  INTERFACE_LINK_LIBRARIES "netgen_libs"
+  INTERFACE_LINK_LIBRARIES "netgen_core_lib"
 )
 
 # Create imported target ngbla
@@ -109,14 +116,14 @@ set_target_properties(ngsbem PROPERTIES
 add_library(ngcomp SHARED IMPORTED)
 
 set_target_properties(ngcomp PROPERTIES
-  INTERFACE_LINK_LIBRARIES "ngfem;ngla;ngbla;ngstd"
+  INTERFACE_LINK_LIBRARIES "ngfem;ngla;ngbla;ngstd;netgen_lib"
 )
 
 # Create imported target ngsolve
 add_library(ngsolve SHARED IMPORTED)
 
 set_target_properties(ngsolve PROPERTIES
-  INTERFACE_LINK_LIBRARIES "netgen_libs;ngsolve;ngcomp;ngfem;ngsbem;ngbla;ngla;ngstd"
+  INTERFACE_LINK_LIBRARIES "netgen_lib;netgen_core_lib;ngsolve;ngcomp;ngfem;ngsbem;ngbla;ngla;ngstd"
 )
 
 if(CMAKE_VERSION VERSION_LESS 3.0.0)

ngsolve/config/config.py

@@ -29,15 +29,15 @@ NGSOLVE_INSTALL_DIR_INCLUDE  = "netgen/include"
 NGSOLVE_INSTALL_DIR_CMAKE    = "ngsolve/cmake"
 NGSOLVE_INSTALL_DIR_RES      = "share"
 
-NGSOLVE_VERSION = "6.2.2506-60-g1d0a21976"
-NGSOLVE_VERSION_GIT = "v6.2.2506-60-g1d0a21976"
-NGSOLVE_VERSION_PYTHON = "6.2.2506.post60.dev0"
+NGSOLVE_VERSION = "6.2.2506-85-g5e4fc20dd"
+NGSOLVE_VERSION_GIT = "v6.2.2506-85-g5e4fc20dd"
+NGSOLVE_VERSION_PYTHON = "6.2.2506.post85.dev0"
 
 NGSOLVE_VERSION_MAJOR = "6"
 NGSOLVE_VERSION_MINOR = "2"
-NGSOLVE_VERSION_TWEAK = "60"
+NGSOLVE_VERSION_TWEAK = "85"
 NGSOLVE_VERSION_PATCH = "2506"
-NGSOLVE_VERSION_HASH = "g1d0a21976"
+NGSOLVE_VERSION_HASH = "g5e4fc20dd"
 
 CMAKE_CXX_COMPILER           = "/Library/Developer/CommandLineTools/usr/bin/c++"
 CMAKE_CUDA_COMPILER          = ""

ngsolve/directsolvers.py

@@ -1,26 +1,14 @@
 from ngsolve import BaseMatrix, BitArray, BilinearForm, BaseVector
+import ngsolve
 
-class SuperLU(BaseMatrix):
-    # def __init__(self, a: BaseMatrix | BilinearForm, freedofs: BitArray = None):
-    def __init__(self, a, freedofs: BitArray = None):        
-        super().__init__()
-        self.a = a
-        self.freedofs = freedofs
-
-    def Update(self):
+class SuperLU(ngsolve.la.SparseFactorizationInterface):
+    def Factor(self):
         import scipy.sparse as sp
         import scipy.sparse.linalg as spla
-        a = self.a if isinstance(self.a, BaseMatrix) else self.a.mat
-        mat = sp.csr_matrix(a.CSR())
-        if self.freedofs is not None:
-            self.fd = list(self.freedofs)
-            mat = mat[self.fd,:][:,self.fd]
-        self.lu = spla.factorized(sp.csc_matrix(mat))
+        vals, rows, cols = self.GetInnerMatrix().CSR()
+        self.inv_mat = spla.factorized(sp.csr_matrix((vals, rows, cols)))
+
+    def Solve(self, rhs, sol):
+        sol.FV().NumPy()[:] = self.inv_mat(rhs.FV().NumPy())
 
-    def Mult(self, x: BaseVector, y: BaseVector):
-        if not hasattr(self, "lu"):
-            self.Update()
-        if self.freedofs is not None:
-            y.FV().NumPy()[self.fd] = self.lu(x.FV().NumPy()[self.fd])
-        else:
-            y.FV().NumPy()[:] = self.lu(x.FV().NumPy())
+ngsolve.la.RegisterInverseType("superlu", SuperLU)

ngsolve/solvers/cudss.py

@@ -0,0 +1,74 @@
+
+try:
+    import nvmath
+    import nvmath.sparse.advanced as nvs
+except ImportError:
+    raise ImportError("CUDSS solver requires nvmath-python module.")
+import ngsolve.la as ngla
+import scipy.sparse as sp
+import numpy as np
+
+
+class CudssSolver(ngla.SparseFactorizationInterface):
+    def Analyze(self):
+        self._mat = self.GetInnerMatrix()
+        csr = sp.csr_matrix(self._mat.CSR())
+        self._tmp = np.empty(csr.shape[1], dtype=csr.dtype)
+        options = make_directsolver_options()
+        self.solver = nvs.DirectSolver(csr, self._tmp, options=options)
+        self.solver.plan()
+
+    def Factor(self):
+        self.solver.factorize()
+
+    def Solve(self, b, sol):
+        self.solver.reset_operands(b=b.FV().NumPy())
+        sol.FV().NumPy()[:] = self.solver.solve()
+
+
+ngla.RegisterInverseType("cudss", CudssSolver)
+
+
+# find cudss multithreading lib from installed distribution
+
+import os, pathlib
+from importlib import util as importlib_util
+from importlib import metadata as importlib_metadata
+
+def _from_dist_files():
+    # Use the wheel’s file manifest (most reliable)
+    candidates = []
+    for dist_name in ("nvidia-cudss-cu12", "nvidia_cudss_cu12", "nvidia-cudss"):  # try common variants
+        try:
+            dist = importlib_metadata.distribution(dist_name)
+        except importlib_metadata.PackageNotFoundError:
+            continue
+        for f in dist.files or []:
+            name = f.name.lower()
+            # check for name ends in .so or .so.*
+            endwith_so = name.endswith(".so") or (".so." in name and name.rsplit(".so.", 1)[1].replace(".", "").isdigit())
+            if name.startswith("libcudss_mtlayer_") and endwith_so:
+                candidates.append(dist.locate_file(f))
+            if name.startswith("cudss_mtlayer_") and name.endswith(".dll"):
+                candidates.append(dist.locate_file(f))
+        if candidates:
+            # Prefer anything in bin/ or lib/ if multiple
+            candidates.sort(key=lambda p: ("bin" not in str(p) and "lib" not in str(p), str(p)))
+            return str(candidates[0])
+    return None
+
+
+def make_directsolver_options():
+    # Helpful on Windows (Python 3.8+): ensure DLL deps can be found
+    if os.name == "nt":
+        for var in ("CUDA_PATH", "CUDSS_PATH", "CONDA_PREFIX"):
+            base = os.environ.get(var)
+            if base:
+                p = pathlib.Path(base) / "bin"
+                if p.exists():
+                    try:
+                        os.add_dll_directory(str(p))
+                    except Exception:
+                        pass
+    mtlib = _from_dist_files()
+    return nvs.DirectSolverOptions(multithreading_lib=mtlib)

{ngsolve-6.2.2506.post60.dev0.dist-info → ngsolve-6.2.2506.post85.dev0.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: ngsolve
-Version: 6.2.2506.post60.dev0
+Version: 6.2.2506.post85.dev0
 Summary: NGSolve
 Author: The NGSolve team
 License: LGPL2.1
 License-File: LICENSE
-Requires-Dist: netgen-mesher (==6.2.2506.post8.dev0)
+Requires-Dist: netgen-mesher (==6.2.2506.post14.dev0)
 

{ngsolve-6.2.2506.post60.dev0.dist-info → ngsolve-6.2.2506.post85.dev0.dist-info}/RECORD

@@ -1,10 +1,10 @@
-netgen/libngbla.dylib,sha256=BbW5lRuybwvPnncduH8SiJfNz90XsoYnfLkMO_bcosw,5859920
-netgen/libngcomp.dylib,sha256=3xuR79SQw5IEi-m_03vJoS1Pjeo-QVde9KYJoc0EtHQ,43094720
-netgen/libngfem.dylib,sha256=ye3VWOgoHRNQXgiRN6ZbCLzTfIZRFn0Aro1O302j7jI,51693040
-netgen/libngla.dylib,sha256=igAlsaiv49lf-k8MXhXXaPMFIUtP6Ap0DitqXL-_tUY,25567728
-netgen/libngsbem.dylib,sha256=SYjz8Qn55MsUoZOcIRBF0ZRPEoAOWginjif3vVPhWDc,9473920
-netgen/libngsolve.dylib,sha256=Fc0RE6ytRezOAiyK0ZSDnXTGuBNnNY2WAMAE7xJMVIU,944000
-netgen/libngstd.dylib,sha256=MYgYMaWRb9IBWaGdpnP5IqvRbYF-6Uu2hUv0xuHq4HU,939808
+netgen/libngbla.dylib,sha256=7TJQ901oVZDcAu8CoHlUG108VAR5NMkOirWhFASs5SA,5989488
+netgen/libngcomp.dylib,sha256=cBNS_z0UrQJZ2XmjHdSWhAtfSjVbGg7-gP-aAXkr46w,44664208
+netgen/libngfem.dylib,sha256=Mp27Gz2WeB7GG_-RAHPJQM1AsW932lxeMbgq5XbVjdM,52069760
+netgen/libngla.dylib,sha256=rYFsjFDoRXmqrz0TYDeUFAT1gkVp_ToIaXIa2nf-gPw,26267840
+netgen/libngsbem.dylib,sha256=xdIApOlgxKKc5ybkdp_HwnycMoq8SS5_D2zYRGini4M,9696176
+netgen/libngsolve.dylib,sha256=QaU0AAraHCbmUMkKpq6JyfJ1shRXovuDHmBDfEEmp44,1069648
+netgen/libngstd.dylib,sha256=NP8BUtsTeOnXVeDd6G-WGhtXVkUWyUfLaCJqnDg_nwM,1041424
 netgen/include/analytic_integrals.hpp,sha256=xLVJ8n0-t6UlU_yKE8i0vYkXilsNuqVixkzJlmxptKw,238
 netgen/include/arnoldi.hpp,sha256=b8mRu9wGyaLa7z6mXCFIhxfW_xcQvsOMD6TqbfYZ05g,1437
 netgen/include/bandmatrix.hpp,sha256=zwKz89QY53MPsWgNsl0cXEAFKka_W4sXPIO54M3eT80,7778
@@ -104,7 +104,7 @@ netgen/include/intrule.hpp,sha256=VSDdG7fpraQHY1eZFaKo7bLyfpwBjMM0Z2qJgcmYW3w,80
 netgen/include/intrules_SauterSchwab.hpp,sha256=1HiSgmdJHNoCp1ZYY7gNFPHdanepbGtay2YJrTaYHBg,650
 netgen/include/irspace.hpp,sha256=DcpkPMFKx5nDvfLfTWKmpYuLX-X5rBuWF8Ta9e__m-A,1508
 netgen/include/jacobi.hpp,sha256=hFhMn5Q46_DxHGofXV_or5VCTREslMvpccV7FZCAefE,4738
-netgen/include/kernels.hpp,sha256=pKuBM9bjaEdhpnTVJKF68-4-XP9s8xMKmBE8cnFR_Dc,23574
+netgen/include/kernels.hpp,sha256=duCj2F7Gzz6drTp7_vi-oGIra0IiVK9VP5Ov4bpanCg,24354
 netgen/include/l2hofe.hpp,sha256=kbCezYmmgGqfIN0WZRNDKBEoWQTTcgpg7TEuDERolSY,6696
 netgen/include/l2hofe_impl.hpp,sha256=-rWVybAL7QTkfNNXAz1tP4RYQcBuOVYLTZE3E502tuA,15848
 netgen/include/l2hofefo.hpp,sha256=sQhmfliTW2Ac_XLucufzbRdtSRr471i3qPFAMSByvU0,16592
@@ -115,8 +115,8 @@ netgen/include/matrix.hpp,sha256=6Tg9xvyHWRmzrmK_pa15fE_V77y9pof3z78GnyzXmRE,557
 netgen/include/memusage.hpp,sha256=H-8rWQ8UQDCnOiYQnbwvILPuPoJD8bqwiNGB2QAUa0o,1168
 netgen/include/meshaccess.hpp,sha256=j5dinD-8bVm18MkVqG9j-IhhZUHHXw3erdZy-LHxl-8,47133
 netgen/include/mgpre.hpp,sha256=zdNozWRSyluOF8E4GLeOR290Yw2wqGYGc1sTTSB5n3U,4825
-netgen/include/mp_coefficient.hpp,sha256=AvH0tzkfqeOGZiydF2f0-M7vtW-29szci-9Krpl_Dow,4980
-netgen/include/mptools.hpp,sha256=elGoYLWZooEjH8NJmFOzFQJD_tuqgjDaCWZk7aZWzmo,70712
+netgen/include/mp_coefficient.hpp,sha256=EFdnM3YDWmNya2NskFV5Idur6RKpGoHcgwN0qogB5hI,5016
+netgen/include/mptools.hpp,sha256=_SR1XBtP7oGw7sZHNEINZJj-Fn-4IrGFM4b9aIiuNww,71593
 netgen/include/multigrid.hpp,sha256=ovl1GXcTfXuYLVVMcFfCKP5sg6diSGlqdjCMMPCgFUo,856
 netgen/include/multivector.hpp,sha256=nuLxMiq2y6HoH5w9j6ka2BhJjRyREPeEnNFx_x0SMU0,12635
 netgen/include/mumpsinverse.hpp,sha256=Jaa5NPQzwPo2kSbHijI_LX3tr0qUmVhqVlRM14KeD18,4062
@@ -147,7 +147,7 @@ netgen/include/pmltrafo.hpp,sha256=SrlOgJ4qmBST4uIjtl4VatEw5dsGrL1-7xSrXnuAPAg,1
 netgen/include/postproc.hpp,sha256=kaMQUfm_kd5Q4E0C5NaXPv3XyZncgOjwnZrvNJIP39A,5192
 netgen/include/potentialtools.hpp,sha256=Js9DZrAHaAnQT61v0vFcd4RX6vYtxWbXsW4kueo8m9c,465
 netgen/include/precomp.hpp,sha256=R-xo8gpTBNlyaQ-vj12q-VZoGZMox0FM5IWF22zWmMA,1277
-netgen/include/preconditioner.hpp,sha256=RW6Bf782q38Bx77ia3Iz3gwR_q8bp2O0bpsMHYswPBQ,14166
+netgen/include/preconditioner.hpp,sha256=5TN6kvNNNk2JxR2ghUdD1iunrnCPgoeOE7z6NEW_zEw,14158
 netgen/include/prolongation.hpp,sha256=_VUX2vzhcXOGPM1HnRBXkTKrNyXew72VWRnAnvFitF4,10927
 netgen/include/python_comp.hpp,sha256=IVR8USVPy6hf1ZksUCUjvXcK7lcnyTpqzteR8a6Sblw,3464
 netgen/include/python_fem.hpp,sha256=9-GoQrCprOReAgK9-v_X3NwGWJ229vmGjtwGI9td5GA,3072
@@ -164,12 +164,13 @@ netgen/include/simd_complex.hpp,sha256=1L_WGuaYlR_xQdMMC4o0_aBX484GqrLuShG7pHG4i
 netgen/include/smoother.hpp,sha256=hZAe15R6BU88hMfhcTM3-eclRgzmHJnPKgYYWol9Sx8,6643
 netgen/include/solve.hpp,sha256=OZQfkg6HN20eudQ4kkRSecr-miwV35NPEjAtoMcunG4,2034
 netgen/include/sparsecholesky.hpp,sha256=2HKM6aKO02YX32jxGna6CAjBBfeXvCsmPk4hoWZWIQk,8888
+netgen/include/sparsefactorization_interface.hpp,sha256=Hi6toUHpgKDCo4zqhZNSLbz1qOY_z3FqJVHcXCz-pjY,4143
 netgen/include/sparsematrix.hpp,sha256=3FCqp4zDtgi0CnrLdmmxzHiiub4jpIqg4yR1-eWQc8Q,32741
 netgen/include/sparsematrix_dyn.hpp,sha256=u9aWEYl6PhrevL9SPSXVE22_EIwIduDDvzY8xgIsw4Q,2656
 netgen/include/sparsematrix_impl.hpp,sha256=neN0xhP5nkT90B3U-u2uX2dgqU3l6m_zhsAihI8XtF0,30219
 netgen/include/special_matrix.hpp,sha256=1moUjxQ_uaS-GWrSbrbN4c8N3pDma9UpSaFqrNUXV80,16526
 netgen/include/specialelement.hpp,sha256=iiQaIE-cHbwGX014jET8k-rfb8k1GT6Gs_vsMIBWaOA,3226
-netgen/include/statushandler.hpp,sha256=Lh0Cevr7xnEoFW4QhTlNzEq9brpneGGmjAbv9o1kotY,646
+netgen/include/statushandler.hpp,sha256=DTwByT_TMdV6jC3JMxw-_kxd9xtUtkKrcEF8ysI53CQ,671
 netgen/include/stringops.hpp,sha256=QiiQAFqB87FhxuMO_sigJU7L6FHfE3ebBy-cngouf_U,262
 netgen/include/superluinverse.hpp,sha256=FDSnHdTbVFDsFPF6B56IZJPDQKZx4fp2OubRQjE5_TU,3165
 netgen/include/symbolicintegrator.hpp,sha256=6LYXezRPon5_7RUSwT9tcqMZXI7ee72XTZ7G08MZ5sw,36047
@@ -201,28 +202,27 @@ ngsolve/__expr.py,sha256=ZJFhvQ6S14AAwm3dVyEy-ixMwPw_ZOhMnOqyfXNVKnw,4215
 ngsolve/__init__.py,sha256=jiKgjpR98P6_MojCVJKnSRGkr1gbZ0fY3tdLCnoPLec,5472
 ngsolve/_scikit_build_core_dependencies.py,sha256=3a7XNqFjWNfA4ADwcNA7NhatXcHY2aHf1RuGtaFmmks,735
 ngsolve/bvp.py,sha256=oRcYhe17uOl3G2zTwf4CYsMDUTcFs0wb4AYu_cKADtk,1987
-ngsolve/directsolvers.py,sha256=ilZmA6_fQulvPZmstKfuyCFI8cj9neEleqKUHxqFpQw,995
+ngsolve/directsolvers.py,sha256=Jyx3-M8VVspuKcNkdB_-sdBx8B5BmnbtqshLTI9wnns,512
 ngsolve/eigenvalues.py,sha256=sQ8cgtK2wRoSVU2OrR3NdJWf1OmLS-KbDnm5K9Av74s,9309
 ngsolve/internal.py,sha256=bXUxNpvi4zaskEt9QJ_IEiv_Hn43kg5JVv1wmMUYBfE,5113
 ngsolve/krylovspace.py,sha256=wBSsE4-lmBnJsiNU1BYBKjfYgFAcqR1Ioe84DMwIjIM,31863
 ngsolve/meshes.py,sha256=fxxtbxkfKuO2nUkXUiYwAwBAVxr9gkdnyIbZX3VpITQ,26786
 ngsolve/ngs2petsc.py,sha256=6978Z7Na6eMOZ5NTEZx0ZVflyX6Kyy4gPQT_9RYuNss,12499
 ngsolve/ngscxx.py,sha256=q3t5DgE3sJazWueas8FTXJ9jZM-LVa9KbGj_RTam6V4,1293
-ngsolve/ngslib.so,sha256=IM3vb9hsk0R_cGRfu_WUcwrbvOAiqDZi_iaWE5RaV5Q,336760
+ngsolve/ngslib.so,sha256=eIil7sQVWEG_SrLeovXm1ptXoFUNAphJ_WvJw5gzdN4,374712
 ngsolve/nonlinearsolvers.py,sha256=8Q_CrD9vjdpZRV9sj2Fth7Y_kJJl7djPgarQmTK7Xfw,8216
 ngsolve/preconditioners.py,sha256=DLRUd9wQwxXUWL1wEBAbHQbWNp71qZYOFvH5Krfa834,239
 ngsolve/solve_implementation.py,sha256=-yyggHGmivv_hhSfRpShFqfWw2SOECpR3BMvccidvE4,5540
-ngsolve/solvers.py,sha256=WgZ9X1x9mtQegXDu8VcTjP-wbS2EnrUS96Y8LXqeflw,304
 ngsolve/timestepping.py,sha256=SLbsgE5pY5tXYTLGlVypk4kS2Ui8GxOwWmKVxqneZRU,8350
 ngsolve/timing.py,sha256=Xqkq2byJjNNK9vJjHG2O3cMf6xuKIyySjk8yv6Le2T8,3985
 ngsolve/utils.py,sha256=V2yVF4K3uv1007-DEs_GrzJ3BOOh09c4lDGGR1Xw-PU,4557
 ngsolve/webgui.py,sha256=EUhaOtWHZy80aLXhXbHwbCQVNjRSw-BAAE50cz7Ydaw,24313
-ngsolve/cmake/NGSolveConfig.cmake,sha256=wwyp0QJIKGPrEOx9rCVUFIvxjWqZG1gNb6ibMs_uda0,5066
+ngsolve/cmake/NGSolveConfig.cmake,sha256=M8ELOsBcHdKcoPGgxw0F0RIM2k4DvCLSdl-PakfrEpM,5066
 ngsolve/cmake/ngsolve-targets-release.cmake,sha256=2dUHzaaMQX08eT7Tjti0crzp_Ah3oqW86gp5UgSufmw,3426
-ngsolve/cmake/ngsolve-targets.cmake,sha256=1cQTFW-4aJfY356XRcuslSbFClmwPOSS03bj3WL15iM,5637
+ngsolve/cmake/ngsolve-targets.cmake,sha256=M4iqepKAN5cMIPI7M3pavgHAx75siSAWiI4rPCnyrOo,5850
 ngsolve/config/__init__.py,sha256=A00lpnUKg-q3y_b-cN3jKF9urkGTGjb2Yz_gGc9WCLs,22
 ngsolve/config/__main__.py,sha256=m8k2RrXnXR5oYaUna1dwkKNhOZBiM7EyFSE9kIcZKvo,89
-ngsolve/config/config.py,sha256=O3wc_XkBmGo7LOKLwssO0XttebuymyWnbjwoy07vQhk,2467
+ngsolve/config/config.py,sha256=4c7pzwYNcLnP2J8KKSMCYZGAnZEH5ERhX619CDzyB1k,2467
 ngsolve/demos/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ngsolve/demos/TensorProduct/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ngsolve/demos/TensorProduct/tp_dg_1d_1d.py,sha256=CrJCkbJNinVYUL3DO-4DnCAMGSAhegNc0QVWiJTk3Js,2109
@@ -254,41 +254,43 @@ ngsolve/demos/mpi/mpi_cmagnet.py,sha256=HuN4lttA2q2kNWss6LZNUKraHqskRQNVEBRjkrU2
 ngsolve/demos/mpi/mpi_navierstokes.py,sha256=Sct0G6EziYVfeIeSa7_b6r3WiYXcxZekoOGsZQALx-c,2911
 ngsolve/demos/mpi/mpi_poisson.py,sha256=UvXODjpWtqIgqq7lvMJf3ZEoJZLY1Dck-82R7auiW6I,2468
 ngsolve/demos/mpi/mpi_timeDG.py,sha256=TPJZ-DwmzOpuAol-fFKeU-R2rJ74MbjOm3DDkQI9BcY,1881
-ngsolve-6.2.2506.post60.dev0.data/data/Netgen.icns,sha256=Ebqct4LKxLzxdJLwGg0tTUQb1VjLwkKhtmdYhpRhKjg,291475
-ngsolve-6.2.2506.post60.dev0.data/data/bin/ngscxx,sha256=TDWPvQxbPYsPFhbPU6RlApEuxCoOOzwj3J80VKMMyp8,1755
-ngsolve-6.2.2506.post60.dev0.data/data/bin/ngsld,sha256=50UErkFWLTocn8GtZDTkUWmPTIqsoK5lcfBGwyP0Vnc,557
-ngsolve-6.2.2506.post60.dev0.data/data/bin/ngsolve.tcl,sha256=SSBYLyp4zgl6eM17LXIiLoj1Doy-h2s4EZg6oKi6ucA,20995
-ngsolve-6.2.2506.post60.dev0.data/data/bin/ngspy,sha256=OvTnzkYgC9G3IK42QJpjmXkV7Q_Arig43STSfPDsDD4,103
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/beam.geo,sha256=EtxklGAIo6SxZlHHC_FZHoQGZqZUDGJQSheEMFO-bJ8,387
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/beam.vol,sha256=aotG4VA7sIgAsPQsYkzbMP1Jta_TddG2gMCblkSPkqc,13594
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/chip.in2d,sha256=g6C-mcoD8-q9JtZpuh4mf4iFEZUIGvvivp4C5YYMlAw,551
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/chip.vol,sha256=if0yLn8E3P4mZ_X5sBcrEIp2C4ZhMysGROtB1YCkJHI,27897
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/coil.geo,sha256=PVD4I9ztZowKwNOUrjnoOP7Tj2KG9J0UCJFRS9EhlxU,364
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/coil.vol,sha256=IOZe4oPxMUa9vBGJWN4LG9M79XAruY23S2rtAh_2_98,144724
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/coilshield.geo,sha256=lCUDCAhfowBttSGEY_giyY0xEFInAbgVfIPwSWBb504,605
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/coilshield.vol,sha256=2Dq5VCX7dqGxo_ExtUhI716I-SnxhLGPawW29IR9nYY,162397
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/cube.geo,sha256=kbBNVUYVSf1ogV7-Xf31KXju3LCUIPaDLfvwZHMgddI,386
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/cube.vol,sha256=54108a3RvrTUOJSFltxUY8iiNzyWoBTtNrWM0kufj7c,90295
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d10_DGdoubleglazing.pde,sha256=bPQAvbYlyvCfLzk9cOzjXDn94UFC_vBCONl7fEIaMVs,1304
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d11_chip_nitsche.pde,sha256=Mq3Ap63mWqjQyXsASFAlkRQ0AWxBlY3BYYejTYd-lwg,1101
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d1_square.pde,sha256=ysOroxhoAOePmB_Aswps9iGjA2qV5435iu3hOnSvN8M,1029
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d2_chip.pde,sha256=AowiGbuAWEdyFUB3d1LlZeQ7rarbkqIYsj1QcWc89-A,950
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d3_helmholtz.pde,sha256=nG0HxrxboI2qGoR5_LNZt7RYB7ji2o5jtkyIqTFR4y8,568
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d4_cube.pde,sha256=-C4RgoVtBXZu7XHCwZy7F7pr_PGNGcRwWCFzBppq1mQ,1033
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d5_beam.pde,sha256=QOYC7YN7LdcjSFeLdJu1Tlfi-lmsVsa7b9G6qoCsGo8,1985
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d6_shaft.pde,sha256=Iua3INfuIUeaBk21qNg4u5KZt__H1B8BZUsy5frjhdY,1901
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d7_coil.pde,sha256=-ELH2obynMJcvSOqoYT1OThXcllIcdss0ZrklLSimZw,1200
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d8_coilshield.pde,sha256=WUUulvd3dsedB25sFVQgU7FgZ3B7BkbxgkXTEBglk1w,1141
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d9_hybridDG.pde,sha256=drLxnz1GvCEeme-FV772cGbS-YTgeUB4G5DrbkLdapw,1479
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/doubleglazing.in2d,sha256=bKn7m7eCcoLimGgoO3nxhiu7Mm0lIRnbx0TJh5dC1I0,506
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/doubleglazing.vol,sha256=Eg-H6nl2Hd5Nr593SFCCLVTDl25kIXuddrWpd7xlrP8,34987
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/piezo2d40round4.vol.gz,sha256=RuxM0vtYljoAImOH6U6avt0LmWaUbGNao37n8p_Yd1w,496477
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/shaft.geo,sha256=aPbk4EItJSLN_PjpOejnijk74y53QBW-IPCXHvLNlVs,2434
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/shaft.vol,sha256=fT8qu1L-p0MkI-l3WVisKG52W5FCzO_NzXaCvMJT1V4,270450
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/square.in2d,sha256=evpVgNNzReABv6bIs4J_r1OFeedMppoS-TEzE-tfKgY,192
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/square.vol,sha256=IXIHYmq85hkFsMVZ_vEVthUnd0YTQWE4jRegjW8_ImI,9162
-ngsolve-6.2.2506.post60.dev0.dist-info/LICENSE,sha256=oZDcnIBDdV2Q-LCnX6ZrnkLUr0yYC_XdxjPwEk2zzuc,26430
-ngsolve-6.2.2506.post60.dev0.dist-info/METADATA,sha256=SXfVozWFZLbFcs7BUo1BcCYIuYEAujCBHKpXlIFRmHQ,201
-ngsolve-6.2.2506.post60.dev0.dist-info/WHEEL,sha256=YeDGh2t9OVO8eQwJ7A2CpeTltZRPMYGUji0_oep_V1g,110
-ngsolve-6.2.2506.post60.dev0.dist-info/top_level.txt,sha256=1llU44DxNIP85uPT4RChsIuV3h2d0_5j0Ui_Df5vV8E,15
-ngsolve-6.2.2506.post60.dev0.dist-info/RECORD,,
+ngsolve/solvers/__init__.py,sha256=WgZ9X1x9mtQegXDu8VcTjP-wbS2EnrUS96Y8LXqeflw,304
+ngsolve/solvers/cudss.py,sha256=7JbJKFKWafB4gJevID88lzNLaJw-kBUwEPJ68tuTT_g,2663
+ngsolve-6.2.2506.post85.dev0.data/data/Netgen.icns,sha256=Ebqct4LKxLzxdJLwGg0tTUQb1VjLwkKhtmdYhpRhKjg,291475
+ngsolve-6.2.2506.post85.dev0.data/data/bin/ngscxx,sha256=TDWPvQxbPYsPFhbPU6RlApEuxCoOOzwj3J80VKMMyp8,1755
+ngsolve-6.2.2506.post85.dev0.data/data/bin/ngsld,sha256=50UErkFWLTocn8GtZDTkUWmPTIqsoK5lcfBGwyP0Vnc,557
+ngsolve-6.2.2506.post85.dev0.data/data/bin/ngsolve.tcl,sha256=SSBYLyp4zgl6eM17LXIiLoj1Doy-h2s4EZg6oKi6ucA,20995
+ngsolve-6.2.2506.post85.dev0.data/data/bin/ngspy,sha256=OvTnzkYgC9G3IK42QJpjmXkV7Q_Arig43STSfPDsDD4,103
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/beam.geo,sha256=EtxklGAIo6SxZlHHC_FZHoQGZqZUDGJQSheEMFO-bJ8,387
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/beam.vol,sha256=aotG4VA7sIgAsPQsYkzbMP1Jta_TddG2gMCblkSPkqc,13594
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/chip.in2d,sha256=g6C-mcoD8-q9JtZpuh4mf4iFEZUIGvvivp4C5YYMlAw,551
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/chip.vol,sha256=if0yLn8E3P4mZ_X5sBcrEIp2C4ZhMysGROtB1YCkJHI,27897
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/coil.geo,sha256=PVD4I9ztZowKwNOUrjnoOP7Tj2KG9J0UCJFRS9EhlxU,364
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/coil.vol,sha256=IOZe4oPxMUa9vBGJWN4LG9M79XAruY23S2rtAh_2_98,144724
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/coilshield.geo,sha256=lCUDCAhfowBttSGEY_giyY0xEFInAbgVfIPwSWBb504,605
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/coilshield.vol,sha256=2Dq5VCX7dqGxo_ExtUhI716I-SnxhLGPawW29IR9nYY,162397
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/cube.geo,sha256=kbBNVUYVSf1ogV7-Xf31KXju3LCUIPaDLfvwZHMgddI,386
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/cube.vol,sha256=54108a3RvrTUOJSFltxUY8iiNzyWoBTtNrWM0kufj7c,90295
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/d10_DGdoubleglazing.pde,sha256=bPQAvbYlyvCfLzk9cOzjXDn94UFC_vBCONl7fEIaMVs,1304
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/d11_chip_nitsche.pde,sha256=Mq3Ap63mWqjQyXsASFAlkRQ0AWxBlY3BYYejTYd-lwg,1101
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/d1_square.pde,sha256=ysOroxhoAOePmB_Aswps9iGjA2qV5435iu3hOnSvN8M,1029
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/d2_chip.pde,sha256=AowiGbuAWEdyFUB3d1LlZeQ7rarbkqIYsj1QcWc89-A,950
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/d3_helmholtz.pde,sha256=nG0HxrxboI2qGoR5_LNZt7RYB7ji2o5jtkyIqTFR4y8,568
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/d4_cube.pde,sha256=-C4RgoVtBXZu7XHCwZy7F7pr_PGNGcRwWCFzBppq1mQ,1033
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/d5_beam.pde,sha256=QOYC7YN7LdcjSFeLdJu1Tlfi-lmsVsa7b9G6qoCsGo8,1985
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/d6_shaft.pde,sha256=Iua3INfuIUeaBk21qNg4u5KZt__H1B8BZUsy5frjhdY,1901
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/d7_coil.pde,sha256=-ELH2obynMJcvSOqoYT1OThXcllIcdss0ZrklLSimZw,1200
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/d8_coilshield.pde,sha256=WUUulvd3dsedB25sFVQgU7FgZ3B7BkbxgkXTEBglk1w,1141
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/d9_hybridDG.pde,sha256=drLxnz1GvCEeme-FV772cGbS-YTgeUB4G5DrbkLdapw,1479
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/doubleglazing.in2d,sha256=bKn7m7eCcoLimGgoO3nxhiu7Mm0lIRnbx0TJh5dC1I0,506
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/doubleglazing.vol,sha256=Eg-H6nl2Hd5Nr593SFCCLVTDl25kIXuddrWpd7xlrP8,34987
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/piezo2d40round4.vol.gz,sha256=RuxM0vtYljoAImOH6U6avt0LmWaUbGNao37n8p_Yd1w,496477
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/shaft.geo,sha256=aPbk4EItJSLN_PjpOejnijk74y53QBW-IPCXHvLNlVs,2434
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/shaft.vol,sha256=fT8qu1L-p0MkI-l3WVisKG52W5FCzO_NzXaCvMJT1V4,270450
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/square.in2d,sha256=evpVgNNzReABv6bIs4J_r1OFeedMppoS-TEzE-tfKgY,192
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/square.vol,sha256=IXIHYmq85hkFsMVZ_vEVthUnd0YTQWE4jRegjW8_ImI,9162
+ngsolve-6.2.2506.post85.dev0.dist-info/LICENSE,sha256=oZDcnIBDdV2Q-LCnX6ZrnkLUr0yYC_XdxjPwEk2zzuc,26430
+ngsolve-6.2.2506.post85.dev0.dist-info/METADATA,sha256=NWtrcjqBhur0sHOzVf8nXVbPCrKoAOPpv_BaSR_yeBw,202
+ngsolve-6.2.2506.post85.dev0.dist-info/WHEEL,sha256=YeDGh2t9OVO8eQwJ7A2CpeTltZRPMYGUji0_oep_V1g,110
+ngsolve-6.2.2506.post85.dev0.dist-info/top_level.txt,sha256=1llU44DxNIP85uPT4RChsIuV3h2d0_5j0Ui_Df5vV8E,15
+ngsolve-6.2.2506.post85.dev0.dist-info/RECORD,,