ngsolve 6.2.2506.post60.dev0__cp310-cp310-win_amd64.whl → 6.2.2506.post85.dev0__cp310-cp310-win_amd64.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
@@ -75,7 +82,7 @@ add_library(ngstd INTERFACE IMPORTED)
 set_target_properties(ngstd PROPERTIES
   INTERFACE_COMPILE_DEFINITIONS "HAVE_NETGEN_SOURCES;USE_TIMEOFDAY;TCL;LAPACK;USE_PARDISO;NGS_PYTHON"
   INTERFACE_COMPILE_OPTIONS "/std:c++17;/bigobj;/wd4068;-DMAX_SYS_DIM=3"
-  INTERFACE_LINK_LIBRARIES "netgen_libs;\$<LINK_ONLY:>"
+  INTERFACE_LINK_LIBRARIES "netgen_core_lib;\$<LINK_ONLY:>"
 )
 
 # Create imported target ngbla
@@ -110,14 +117,14 @@ set_target_properties(ngsbem PROPERTIES
 add_library(ngcomp INTERFACE IMPORTED)
 
 set_target_properties(ngcomp PROPERTIES
-  INTERFACE_LINK_LIBRARIES "ngfem;ngla;ngbla;ngstd;\$<LINK_ONLY:>"
+  INTERFACE_LINK_LIBRARIES "ngfem;ngla;ngbla;ngstd;\$<LINK_ONLY:>;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           = "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.44.35207/bin/Hostx64/x64/cl.exe"
 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,10 +1,10 @@
 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
 Requires-Dist: mkl
 

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

@@ -1,4 +1,4 @@
-netgen/libngsolve.dll,sha256=PK0qtkYU8c1pL8PFiws8PLPVcpQYaXcEdgQkB5-_90Y,37615616
+netgen/libngsolve.dll,sha256=zTTGYu5InD_95kDf0jPztIx9GACknviTM3LdBvkTZgc,38095872
 netgen/ngscxx.bat,sha256=Xw_hdRbpmz5NgZfbPoExNHXl0QsfvPp4ppoi8gqb7es,698
 netgen/ngsld.bat,sha256=YD1I1rK70K_YvLev7aYQMD9mCcwF55k1B_8pRWPpob0,428
 netgen/ngspy,sha256=MaX37DUOAnfU-gDmgQTw3fRs6JSJE6Jbq6xMSKNk_JQ,70
@@ -101,7 +101,7 @@ netgen/include/intrule.hpp,sha256=zZAu7zxZ6oiHjE-UfRyRPZOJi5LMgJFItQHz0pORNvM,83
 netgen/include/intrules_SauterSchwab.hpp,sha256=2f9Lb77H6sgaVq7576L78zNGbv4MYgHpddIzfc36TKA,675
 netgen/include/irspace.hpp,sha256=UFWeaFVUDwsHCJZqtZBBDnhWC4Oyy34z9Pr6KzofHPg,1557
 netgen/include/jacobi.hpp,sha256=LvjGz2p4Eew3TPsRU34oWMNPXIZ_-tU6prsgjUiqgEs,4891
-netgen/include/kernels.hpp,sha256=YvSgZr4krIbkiVbs7-L_ov5wE7eKtaMLMvDR0HwXoyY,24336
+netgen/include/kernels.hpp,sha256=9z9u0B2MmL8S-dpbmO-RUlU6tyGxq3r35ruF-NY5vJw,25116
 netgen/include/l2hofe.hpp,sha256=DUiwhkbnavfgLy8RgQrp__47fe4USC42E-Loyot0WEQ,6890
 netgen/include/l2hofe_impl.hpp,sha256=GyZPQ2RFQWxBoiS82cg1I3LjTq1M7uFeZ6IHhZVe7Lw,16412
 netgen/include/l2hofefo.hpp,sha256=ZA3Rqc_aGnLkS12eUz_W9AAV0hybvPSOzCIJeIMgIqE,17134
@@ -112,8 +112,8 @@ netgen/include/matrix.hpp,sha256=0UT4qQMFBMf3eq8FS7XTkMbQaVSgz--EiNdVMzGq-Sc,579
 netgen/include/memusage.hpp,sha256=m_-fuupqepSve37WkRkoFHHyTtE9PdGnOVPIdQHlDiw,1209
 netgen/include/meshaccess.hpp,sha256=RSkB9LhWTXRIU8AoVsu-TbksjpXjbNzJfWuKDJ6y5_Q,48492
 netgen/include/mgpre.hpp,sha256=5Zqt3pzrvm3EOfr84iU6rQx23LTkntUTd_s4_i6wEzI,5029
-netgen/include/mp_coefficient.hpp,sha256=gZ7E6DbHH2pmRUWxXvTT0EsaA6ixFGrO-xMCmBgC18E,5125
-netgen/include/mptools.hpp,sha256=TPvAjgpaVnyioNJ9juRXpuK1WzfDKdiiPVvJXgXMGKs,72974
+netgen/include/mp_coefficient.hpp,sha256=KqRt59f1IP57ZicLxUaY3shgBYRRiRGojluftLA4yY0,5161
+netgen/include/mptools.hpp,sha256=7emxNABJ6t2hv27sphqTD0td23pB5ewMya8k86qrygg,73874
 netgen/include/multigrid.hpp,sha256=7YgJfeGTBnb-aFWHrbcVk3dos6XYU0iVCgiY8UvRopY,898
 netgen/include/multivector.hpp,sha256=5rkNSqyPhIXAb1lGKLcy908D9Uw9oqY4wpUXZEXbEPE,13082
 netgen/include/mumpsinverse.hpp,sha256=8YiUlQZMFVsJ0kuwaSphGZvxyEZJAZZApH8XahiTeEo,4249
@@ -144,7 +144,7 @@ netgen/include/pmltrafo.hpp,sha256=j6Sk5tHbzKPT1hj_jI6n6-cRUgV5b3_o3kRNev95wDE,2
 netgen/include/postproc.hpp,sha256=TiEqDkANZJtxl-aOYMac-FKhtSkokXS3AuxAScqUDBQ,5334
 netgen/include/potentialtools.hpp,sha256=RDZ0y-BITX6j503G1nH4XnCAV43z6q40YbiqN7MOxJQ,487
 netgen/include/precomp.hpp,sha256=mx_zGsnBxqRVArwgkDpvUcX8EzP8v_8QwVdOp5m1nWQ,1337
-netgen/include/preconditioner.hpp,sha256=gqw1x3cX1d3-f9IYlBGGVffOif5-uGrzeCBPNdaA2kg,14768
+netgen/include/preconditioner.hpp,sha256=MJsDZuggxGC__Oas7XwB-ZDP9zl4zXMLW-o6gdJ-KeU,14760
 netgen/include/prolongation.hpp,sha256=WjfpHPXxSBa1lOPbrTXEKo44wxe6OeGVMPK-XR0E-7c,11304
 netgen/include/python_comp.hpp,sha256=FgujlcVk9FKWwMBEo9CfJ-q_Kb4TNcCziotVTFIuXvY,3571
 netgen/include/python_fem.hpp,sha256=pdSB1RLhv2Vi52TaRoGpjQ21EHOA3RFAF0jeiWDp6EQ,3161
@@ -161,12 +161,13 @@ netgen/include/simd_complex.hpp,sha256=JOmBhwEPK-LtuXmofWR01ziUWXGTcmzRtoFl34Zp0
 netgen/include/smoother.hpp,sha256=SoVZvhFynyPSIAe-x8EloVluIHUE0k78Dp3sQFu-Yfo,6896
 netgen/include/solve.hpp,sha256=lzCGHU1QOj9VXG43Q8MzvDi48-BfVH_fG8R0ttU8Xfg,2123
 netgen/include/sparsecholesky.hpp,sha256=hOzFoXMEelAdJROF1q4zkYv0yfZgSDhjwaYvRRmiMcE,9201
+netgen/include/sparsefactorization_interface.hpp,sha256=Hbs7OEs8Q7HS9MVC4X5kKA0vS6HI13In_7g4TqKUsRE,4296
 netgen/include/sparsematrix.hpp,sha256=c_FdF060SJ0_qQK3WRQg5Gu042neowQHQ31n8cj3r1E,33779
 netgen/include/sparsematrix_dyn.hpp,sha256=1azpAkASyjwRKiDZ_FVVyBPiLpiZocsW0S9bEMTjprI,2746
 netgen/include/sparsematrix_impl.hpp,sha256=WpqmiecTQpbvE6LSfoouvKBCY6T2Y4FetCclHPa8RTI,31232
 netgen/include/special_matrix.hpp,sha256=j_9NSuEudoEzX3hx6TAdSwOEka5MiQgqJ1lAOwno4ng,16989
 netgen/include/specialelement.hpp,sha256=ovP0KuLWkBRnoc72hfzGgrrigzNQBdJexVAgSUj63vg,3351
-netgen/include/statushandler.hpp,sha256=IJPw19bARTth8D8wc6kHTBkxE4o3QTWB-cGDGz1Q2oE,679
+netgen/include/statushandler.hpp,sha256=NWSeGEz-aB7fNs6WZgObmO66BB9OJ4R4w3v7WSeL4fk,704
 netgen/include/stringops.hpp,sha256=vN_DL7f2M5e9dLpZOHIVDXzwoSovbqtuqClZdYMVDrA,274
 netgen/include/superluinverse.hpp,sha256=A5YmUv_5R0qAzcD4zIxpUPAB6HqLcXuFU6J91Ygmnio,3301
 netgen/include/symbolicintegrator.hpp,sha256=wqNooITNcQVDUiPbs3LIAaV7vpFBLhq1TvupEoDGs2A,36897
@@ -192,14 +193,14 @@ netgen/include/voxelcoefficientfunction.hpp,sha256=zPlatX_nf2ODK2X979wvpm1HXHEzn
 netgen/include/vtkoutput.hpp,sha256=GwPaFtOVY27_1hKwSqpNHV4ppOk3CVsLdMpocm27odQ,6628
 netgen/include/vvector.hpp,sha256=vpnwWlNWsEJB26ve8cKADbUMGVBTTVCFvrBC4r_LDDQ,4785
 netgen/include/webgui.hpp,sha256=xm1S5KHockrzf_R4zHzQ9fzwfQ4H5aZaZm9ItCaR41s,2199
-netgen/lib/libngsolve.lib,sha256=CNIc5bFYgI5LNa5oIE639HVYnDemJt_yNoTmYeGXj4c,13926054
+netgen/lib/libngsolve.lib,sha256=CDwp2TklxfEeckWNDxQq_D4LOQ85tpJU7N2SrHJe_jU,13927470
 ngsolve/TensorProductTools.py,sha256=jD4LtJdEiLt2dDsU6STMXb10yrau_i20gatwGlqbiFQ,8562
 ngsolve/__console.py,sha256=QLnfw1ONU9eVPQZ_LjzY-7b_gfZpRRRdI7imHR1lJR8,2983
 ngsolve/__expr.py,sha256=ZAtv94PVtAdvWWKFIvQGJC55aIEY6ajo-l5Hp-1V-6s,4396
 ngsolve/__init__.py,sha256=_pRJLhaBNqv2q1vigj9p-2YqRbiROROrnl3iVM9G2ow,5620
 ngsolve/_scikit_build_core_dependencies.py,sha256=usioLq44m3uusEH205dW0czyzGmzy87PZgizZKUoPs0,765
 ngsolve/bvp.py,sha256=STQCDhEphVgEK3hfWGJyVkS1vi_ubTTKHq7fnuR-POo,2065
-ngsolve/directsolvers.py,sha256=lVfEluGDFd_u6Y-vyQ08VjHA02xQuklIQ91hMopj-40,1021
+ngsolve/directsolvers.py,sha256=oP6hzWSlmNuobu5tFoMJRRX3Zh-_dib-S_rQ2Z9LEio,526
 ngsolve/eigenvalues.py,sha256=7PRftYxyoBwu0C_kD1lrDI0gjgJOyJWZzAhVQVfTAkI,9673
 ngsolve/internal.py,sha256=IgPpdMN7bdaCrafmJcNLha4CYae06A52AHobPjGrkdw,5202
 ngsolve/krylovspace.py,sha256=uBV8zrTP9RaqlTjYqowFNqVOMfK7ECTg99J8AbeJTWY,32876
@@ -207,21 +208,20 @@ ngsolve/meshes.py,sha256=nz95LP1EEIVAEJ0jyQGqq0E-62uuy2tvIRgqIrEqDHQ,27534
 ngsolve/ngs2petsc.py,sha256=PLAkvu4H-ZEXd0-bM2v0OJX7gga-OJ9d-NB7g322-wQ,12809
 ngsolve/ngscxx.py,sha256=r9TV49w0MKIxE6fgJYO4FNv-5wcM9eAFYIG9GspUy_A,1335
 ngsolve/ngslib.lib,sha256=PMhmZBaGh5nKKYoOl2fg3yeDwwLKpe7a5XttqXXc5xc,1716
-ngsolve/ngslib.pyd,sha256=ggiNtJfnphstrUJqHab3eKMKkllyhAs0xN09aFHRU2w,121344
+ngsolve/ngslib.pyd,sha256=1ria3VPyIgrrrI2_zqBZplYMDadZRs_oJj_uXHKY2iA,136192
 ngsolve/nonlinearsolvers.py,sha256=nKd-SVJseTWztHZPEPKsbv0mLwQjFILZtOh7Ggft0xs,8419
 ngsolve/preconditioners.py,sha256=vsbO1lQG-ibmk88AHsiizDZcBYsfHEL-13_E_l-tYuw,250
 ngsolve/solve_implementation.py,sha256=F2es3RvCb2OWNs1Lxl1jexZXCgmfH6cct8cJapftlEg,5708
-ngsolve/solvers.py,sha256=Vbm5RfIJ83nMtQ1pYJL0uBBuys4-mcY6b63MNkyiqxU,311
 ngsolve/timestepping.py,sha256=SuKsFS7cDXRixKWdMMIWW4flet12HLeqWTBC0DFhPwg,8535
 ngsolve/timing.py,sha256=j_Plbbh51pS9QwMq93hyvFDSrbywmdKZ6Z6OOZmZoe4,4093
 ngsolve/utils.py,sha256=jg6smLuKF6G9Rvg-EXjyYwjFJGyyiqSRknevdjp-9J4,4724
 ngsolve/webgui.py,sha256=HVJnfG96eGuO6ZRfqiWQlRaKbK_Yv5y0QbicfNFAf6A,24983
-ngsolve/cmake/NGSolveConfig.cmake,sha256=gwCObYXVHILWud50g1x_K8OfTLwUSvDZLL4kouXIJT0,5182
+ngsolve/cmake/NGSolveConfig.cmake,sha256=x6c3ECqQLQXvRdp687kgPo5-OW0E6pv88vFywUOVgSk,5182
 ngsolve/cmake/ngsolve-targets-release.cmake,sha256=knQjCmz6J-x_Egg5DosY5hU_CZdZlSQxQ4Za7pS07fA,907
-ngsolve/cmake/ngsolve-targets.cmake,sha256=CDY3Uo0eZa6NGJVRTLZDkbgSrLqTnub8olMieARMi48,5905
+ngsolve/cmake/ngsolve-targets.cmake,sha256=0b9ik_4jQ2mNfqq1oZxhFZq3faLxzmvtR4G8ubzHidQ,6125
 ngsolve/config/__init__.py,sha256=IjGKWBHvRx572Z6m-5z0q82xuQaWlBABy1whwy2Uxak,23
 ngsolve/config/__main__.py,sha256=anI_XpgrpEnVnMyrFiH3Yon_tpQZkehnqRTNC02NiBI,93
-ngsolve/config/config.py,sha256=N4PlPHFTj9sXC2L-aJydZ6shTiPjoYPOY59oXJRMpKA,2549
+ngsolve/config/config.py,sha256=K8p53YoClSwfwWzTS75pqvfVO9RRfW7Ok6b2rmiNACY,2549
 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=3Q9ntmVJGIKQ-JLdGWgECR_kDjTG8FPVCSiTJkxyi40,2188
@@ -253,37 +253,39 @@ ngsolve/demos/mpi/mpi_cmagnet.py,sha256=59TuQvIIGoDStyJneH47NG131nppBoQpZQ9rfvG_
 ngsolve/demos/mpi/mpi_navierstokes.py,sha256=ieAWMDd9LoH99L14iBgF_YmX_xk7gltZ9MruTFN6xAY,3028
 ngsolve/demos/mpi/mpi_poisson.py,sha256=_-H0HFqlwlpasiVD9OQjUvJbWJcQ34-4y-va1WOSOzE,2557
 ngsolve/demos/mpi/mpi_timeDG.py,sha256=FUOh_1dzOGUU-uAsD4iyz0RVT382jMiMiuYkZjarhAE,1963
-ngsolve-6.2.2506.post60.dev0.data/data/Scripts/ngsolve.tcl,sha256=8KBOXZKYU_qx8785PIjdmVjcUbCxR5aYrod0BZ4UgGc,21637
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/beam.geo,sha256=HTv0A6IUoVuavifolhGKY6U44z0hni07Htonqe6rw_A,404
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/beam.vol,sha256=QZbM9JE4rBs5nVXaw7ZAbDf60yXbX19bm1OnOScF57M,13834
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/chip.in2d,sha256=561AjEIPnlzMZHIzep5lRjocQDm8w7o7IDna5u8s9JQ,592
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/chip.vol,sha256=gkEmBWlQh8BkSFNTf-XISfmuGzHXDKANV4Uoww_BwJI,28511
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/coil.geo,sha256=ylB2OiWEZztFXPx99qTNRJKmZFIDPEezEgQt4EPtZRA,376
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/coil.vol,sha256=t8cWP_YX38FMw0S-7vEVUOcSH0VK6DlaqVWG_zmBo-4,147284
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/coilshield.geo,sha256=Sq8w7i22WQ0viaiM3bU_63lZGFWp8JgyDqs3RdjeTe0,629
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/coilshield.vol,sha256=JiZOM9A529-hikvv1kyLwffTRpeatLtaVTNcu42o1fo,165576
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/cube.geo,sha256=Wd9AnPdoQgjQ-JK6zmoXjsNxPR9B8ED4pdHVwmRoe1M,405
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/cube.vol,sha256=RS8bay_KlF6IZM0QDDr7_dGaFLqoxszQU_w8TYutMKY,92127
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d10_DGdoubleglazing.pde,sha256=lK3sXmK74eFEMk8F6hwFHe_tBYnOdRq3F-RbzKpDK0c,1354
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d11_chip_nitsche.pde,sha256=VuEQtkZaIJA9yuvjG_jcx1UB9UtAaZSoeJYFHcHeYxk,1141
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d1_square.pde,sha256=24ZZ0nlbr5LKl_mPyeZZMSkiCBiBk1fzNElo3yITX2A,1072
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d2_chip.pde,sha256=yGIbzuTdCEjdoC9Ig_hbcy5qz69_wxgPZeYmhY1rN7k,985
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d3_helmholtz.pde,sha256=gWqQTh1M9NiKGohlu5JxDJuvRz-T28WlNSVbwmMvM-0,590
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d4_cube.pde,sha256=6kL43ehAh1PdwnFlLjadg325bFjpz02p2PpAOxlDFuc,1079
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d5_beam.pde,sha256=VQt9WbqAVWObFH9Jy1YieE9WHnVZ_hnsKVTz6ysEBxI,2059
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d6_shaft.pde,sha256=y10nLFA2-GwEwnAs5R-8wppRq-09vYJ_C9LJ3DSvlS0,1974
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d7_coil.pde,sha256=KFkqtZiPD4LQsGnghwwdq1qmpWf0T5xQR4HwbRL9ZZA,1250
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d8_coilshield.pde,sha256=9XG0TcgZ7mComh_pVntnuzDldEx5PD-C7gqK05PTWus,1190
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/d9_hybridDG.pde,sha256=vYschVRu5vC91YpyVZFCBFuno-ZlOcRznPD-OvJTLtQ,1551
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/doubleglazing.in2d,sha256=lDCukUh9iTpkiH-qJAVdeAlMpiYF0AibAA6g3jOeWDY,533
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/doubleglazing.vol,sha256=IUOhUrZi8WMnvrIJe--A8cYPN6mscslA8_4yxvKShb0,35724
-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=Y3OVQlWjgICe2Dwz6-Qs8r0tLanjwtWP0xFx5AwNRJk,2507
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/shaft.vol,sha256=IqViJ4hJKk3Uf66PkVJ-kHpBQ_ZpkigRuh5g1Po4euY,274741
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/square.in2d,sha256=5dewiEjTsRFiNkBlmaTjBAZejq55TTlusp8ALfTMc2M,209
-ngsolve-6.2.2506.post60.dev0.data/data/share/ngsolve/square.vol,sha256=tWdPeQ52deUNgWOsWKhqgNVsJKhkJmEAVp5-xjhzEwg,9311
-ngsolve-6.2.2506.post60.dev0.dist-info/LICENSE,sha256=iFoD9UsVeWEjb0aEPnmXKr_NaJC2y7NovH7KMo_5WhI,26934
-ngsolve-6.2.2506.post60.dev0.dist-info/METADATA,sha256=Ia1khH-F9tPRNkGL15_Kh0GRsGTJc1LOiXBcRrVKpcU,227
-ngsolve-6.2.2506.post60.dev0.dist-info/WHEEL,sha256=grXnj_hjz9AcJWnDGoMAyy0X5GgALMAtIvNbRMBzgmk,96
-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=Vbm5RfIJ83nMtQ1pYJL0uBBuys4-mcY6b63MNkyiqxU,311
+ngsolve/solvers/cudss.py,sha256=-1wiJhjW5ddtF2FyPzNXsm-e10jkc0f5VKtqXwsA0S0,2737
+ngsolve-6.2.2506.post85.dev0.data/data/Scripts/ngsolve.tcl,sha256=8KBOXZKYU_qx8785PIjdmVjcUbCxR5aYrod0BZ4UgGc,21637
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/beam.geo,sha256=HTv0A6IUoVuavifolhGKY6U44z0hni07Htonqe6rw_A,404
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/beam.vol,sha256=QZbM9JE4rBs5nVXaw7ZAbDf60yXbX19bm1OnOScF57M,13834
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/chip.in2d,sha256=561AjEIPnlzMZHIzep5lRjocQDm8w7o7IDna5u8s9JQ,592
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/chip.vol,sha256=gkEmBWlQh8BkSFNTf-XISfmuGzHXDKANV4Uoww_BwJI,28511
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/coil.geo,sha256=ylB2OiWEZztFXPx99qTNRJKmZFIDPEezEgQt4EPtZRA,376
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/coil.vol,sha256=t8cWP_YX38FMw0S-7vEVUOcSH0VK6DlaqVWG_zmBo-4,147284
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/coilshield.geo,sha256=Sq8w7i22WQ0viaiM3bU_63lZGFWp8JgyDqs3RdjeTe0,629
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/coilshield.vol,sha256=JiZOM9A529-hikvv1kyLwffTRpeatLtaVTNcu42o1fo,165576
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/cube.geo,sha256=Wd9AnPdoQgjQ-JK6zmoXjsNxPR9B8ED4pdHVwmRoe1M,405
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/cube.vol,sha256=RS8bay_KlF6IZM0QDDr7_dGaFLqoxszQU_w8TYutMKY,92127
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/d10_DGdoubleglazing.pde,sha256=lK3sXmK74eFEMk8F6hwFHe_tBYnOdRq3F-RbzKpDK0c,1354
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/d11_chip_nitsche.pde,sha256=VuEQtkZaIJA9yuvjG_jcx1UB9UtAaZSoeJYFHcHeYxk,1141
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/d1_square.pde,sha256=24ZZ0nlbr5LKl_mPyeZZMSkiCBiBk1fzNElo3yITX2A,1072
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/d2_chip.pde,sha256=yGIbzuTdCEjdoC9Ig_hbcy5qz69_wxgPZeYmhY1rN7k,985
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/d3_helmholtz.pde,sha256=gWqQTh1M9NiKGohlu5JxDJuvRz-T28WlNSVbwmMvM-0,590
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/d4_cube.pde,sha256=6kL43ehAh1PdwnFlLjadg325bFjpz02p2PpAOxlDFuc,1079
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/d5_beam.pde,sha256=VQt9WbqAVWObFH9Jy1YieE9WHnVZ_hnsKVTz6ysEBxI,2059
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/d6_shaft.pde,sha256=y10nLFA2-GwEwnAs5R-8wppRq-09vYJ_C9LJ3DSvlS0,1974
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/d7_coil.pde,sha256=KFkqtZiPD4LQsGnghwwdq1qmpWf0T5xQR4HwbRL9ZZA,1250
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/d8_coilshield.pde,sha256=9XG0TcgZ7mComh_pVntnuzDldEx5PD-C7gqK05PTWus,1190
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/d9_hybridDG.pde,sha256=vYschVRu5vC91YpyVZFCBFuno-ZlOcRznPD-OvJTLtQ,1551
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/doubleglazing.in2d,sha256=lDCukUh9iTpkiH-qJAVdeAlMpiYF0AibAA6g3jOeWDY,533
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/doubleglazing.vol,sha256=IUOhUrZi8WMnvrIJe--A8cYPN6mscslA8_4yxvKShb0,35724
+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=Y3OVQlWjgICe2Dwz6-Qs8r0tLanjwtWP0xFx5AwNRJk,2507
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/shaft.vol,sha256=IqViJ4hJKk3Uf66PkVJ-kHpBQ_ZpkigRuh5g1Po4euY,274741
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/square.in2d,sha256=5dewiEjTsRFiNkBlmaTjBAZejq55TTlusp8ALfTMc2M,209
+ngsolve-6.2.2506.post85.dev0.data/data/share/ngsolve/square.vol,sha256=tWdPeQ52deUNgWOsWKhqgNVsJKhkJmEAVp5-xjhzEwg,9311
+ngsolve-6.2.2506.post85.dev0.dist-info/LICENSE,sha256=iFoD9UsVeWEjb0aEPnmXKr_NaJC2y7NovH7KMo_5WhI,26934
+ngsolve-6.2.2506.post85.dev0.dist-info/METADATA,sha256=Ocudo3m69lOA5QjzdzJz8oPhxJFz_iZEai44__x5unE,228
+ngsolve-6.2.2506.post85.dev0.dist-info/WHEEL,sha256=grXnj_hjz9AcJWnDGoMAyy0X5GgALMAtIvNbRMBzgmk,96
+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,,