ngsolve 6.2.2505.post17.dev0__cp313-cp313-macosx_10_15_universal2.whl → 6.2.2505.post94.dev0__cp313-cp313-macosx_10_15_universal2.whl

netgen/include/ngblas.hpp

@@ -1156,7 +1156,12 @@ namespace ngbla
     }
   };
   
+  // typedef void (*pmatmatcRR)(size_t, size_t, BareSliceMatrix<Complex,RowMajor>, BareSliceMatrix<Complex,RowMajor>,BareSliceMatrix<Complex,RowMajor>);
 
+  template <ORDERING OA, ORDERING OB>
+  using pmatmatc =  void (*)(size_t, size_t, BareSliceMatrix<Complex, OA>, BareSliceMatrix<Complex,OB>,BareSliceMatrix<Complex,RowMajor>);
+  template <bool ADD, bool POS, ORDERING OA, ORDERING OB>
+  extern NGS_DLL_HEADER pmatmatc<OA,OB> dispatch_matmatc[9];
 
   template <bool ADD, bool POS, ORDERING OA, ORDERING OB>
   extern NGS_DLL_HEADER void NgGEMMBare (size_t ah, size_t aw, size_t bw, BareSliceMatrix<Complex,OA> a, BareSliceMatrix<Complex,OB> b, BareSliceMatrix<Complex,RowMajor> c);
@@ -1168,6 +1173,12 @@ namespace ngbla
     size_t ah = a.Height();
     size_t aw = a.Width();
     size_t bw = b.Width();
+    if (aw < std::size(dispatch_matmatc<ADD,POS,OA,OB>))
+      {
+        (*dispatch_matmatc<ADD,POS,OA,OB>[aw])(ah, bw, make_BareSliceMatrix(a), make_BareSliceMatrix(b), make_BareSliceMatrix(c));
+        return;
+      }
+
     NgGEMMBare<ADD,POS>(ah, aw, bw, make_BareSliceMatrix(a), make_BareSliceMatrix(b), make_BareSliceMatrix(c));
   }
   

netgen/include/recursive_pol.hpp

@@ -1507,9 +1507,24 @@ namespace ngfem
   class NormalizedLegendreFunctions : public RecursivePolynomialNonStatic<NormalizedLegendreFunctions>
   {
     int  m;
+    static Matrix<double,ColMajor> matA, matB;
   public:
     NormalizedLegendreFunctions (size_t _m) : m(_m) { }
     
+
+    static void Calc(int mmax)
+    {
+      if (matA.Height() >= mmax+1) return;
+      matA.SetSize(mmax+1, mmax+1);
+      matB.SetSize(mmax+1, mmax+1);
+      for (int m = 0; m <= mmax; m++)
+        for (int n = m+2; n <= mmax; n++)
+          {
+            matA(n,m) = (2*n-1) / sqrt((n-m+0.0)*(n+m));
+            matB(n,m) = sqrt((n+m-1.0)*(n-m-1.0)) / sqrt((n-m+0.0)*(n+m));
+          }
+    }
+    
     template <typename T, typename S>
     NormalizedLegendreFunctions (size_t mmax, size_t nmax, T x, S && values)
     {
@@ -1524,23 +1539,60 @@ namespace ngfem
       auto y = Trans(values);
       
       y = 0.0;
-      double u = -sqrt((1-x)*(1+x));
+      T u = -sqrt((1-x)*(1+x));
       y(0,0)=1;
-      
-      for (double m = 0; m <= mmax; m++)
+
+      if (mmax+1 > matA.Height() || nmax > matA.Width())
+        {
+          for (double m = 0; m <= mmax; m++)
+            {
+              if (m > 0)
+                y(m,m)=y(m-1,m-1)*u*sqrt((2*m-1.0)/(2*m));
+              if (m < nmax)
+                y(m+1,m)=x*y(m,m)*sqrt(2*m+1.0);
+              for (int n = m+2; n <= nmax; n++)
+                y(n,m)=((2*n-1)*x*y(n-1,m) - 
+                        sqrt((n+m-1.0)*(n-m-1.0))*y(n-2,m))
+                  /sqrt((n-m+0.0)*(n+m));
+            }
+        }
+      else
         {
-          if (m > 0)
-            y(m,m)=y(m-1,m-1)*u*sqrt((2*m-1.0)/(2*m));
-          if (m < nmax)
-            y(m+1,m)=x*y(m,m)*sqrt(2*m+1.0);
-          for (int n = m+2; n <= nmax; n++)
-            y(n,m)=((2*n-1)*x*y(n-1,m) - 
-                    sqrt((n+m-1.0)*(n-m-1.0))*y(n-2,m))
-              /sqrt((n-m+0.0)*(n+m));
+          for (double m = 0; m <= mmax; m++)
+            {
+              if (m > 0)
+                y(m,m)=y(m-1,m-1)*u*sqrt((2*m-1.0)/(2*m));
+              if (m < nmax)
+                {
+                  T valold = y(m,m);
+                  
+                  T val = x*valold*sqrt(2*m+1.0);
+                  y(m+1,m)=val;
+                  
+                  auto coefsA = matA.Col(m);
+                  auto coefsB = matB.Col(m);
+                  
+                  for (int n = m+2; n <= nmax; n++)
+                    {
+                      T valnew = coefsA(n) * x * val - coefsB(n) * valold;
+                      y(n,m) = valnew;
+                      valold = val;
+                      val = valnew;
+                    }
+                }
+              /*
+              for (int n = m+2; n <= nmax; n++)
+                y(n,m) = matA(n,m) * x * y(n-1,m) - matB(n,m) * y(n-2,m);
+              */
+            }
         }
+      
       for (int n = 0; n <= nmax; n++)
+        y.Row(n).Range(0,n+1) *= sqrt(2*n+1.0);
+        /*
         for (int m = 0; m <= n; m++)
           y(n,m)=y(n,m)*sqrt(2*n+1.0);
+        */
     }
     
     template <class S>

netgen/include/simd_complex.hpp

@@ -56,6 +56,17 @@ namespace ngcore
     auto & imag() { return im; }
 
 
+    auto Lo() const
+    {
+      if constexpr (N == 2) return Complex(re.Lo(), im.Lo());
+      else return SIMD<Complex,N/2> (re.Lo(), im.Lo());
+    }
+    auto Hi() const
+    {
+      if constexpr (N == 2) return Complex(re.Hi(), im.Hi());
+      else return SIMD<Complex,N/2> (re.Hi(), im.Hi());
+    }
+    
     // Numbers in SIMD structure are not necessarily in same order as in memory
     // for instance:
     // [x0,y0,x1,y1,x2,y2,x3,y3] -> [x0,x2,x1,x3,y0,y2,y1,y3]
@@ -266,6 +277,15 @@ namespace ngcore
     return SIMD<Complex, N> (IfPos (a.real(), b.real(), c.real()),
                              IfPos (a.real(), b.imag(), c.imag()));
   }
+
+
+  template <int N>
+  INLINE SIMD<Complex, N> If (SIMD<mask64, N> a, SIMD<Complex, N> b, SIMD<Complex, N> c)
+  {
+    return SIMD<Complex, N> (If (a, b.real(), c.real()),
+                             If (a, b.imag(), c.imag()));
+  }
+
 }
 
 

netgen/include/sparsematrix_impl.hpp

@@ -475,6 +475,31 @@ namespace ngla
           }
       }
     return this->CreateFromCOO(indi, indj, val, this->Height(), this->Width());
+
+    /*
+      // needs parallelization and testing
+    Array<int> cnt(this->Height());
+    cnt = 0;
+    size_t cnt0 = 0;
+    for (auto i : Range(this->Height()))
+      for (auto j : Range(firsti[i], firsti[i+1]))
+        if (ngbla::L2Norm2(data[j]) > tol*tol)
+          cnt[i]++;
+        else
+          cnt0++;
+
+    cout << "zero-els = " << cnt0 << endl;
+
+
+    auto matrix = make_shared<SparseMatrix<TM>> (cnt, this->Width());
+
+    for (auto i : Range(this->Height()))
+      for (auto j : Range(firsti[i], firsti[i+1]))
+        if (ngbla::L2Norm2(data[j]) > tol*tol)
+          (*matrix)(i, colnr[i]) =  data[j];
+
+    return matrix;
+    */
   }
 
   template <class TM>

netgen/include/vector.hpp

@@ -701,7 +701,8 @@ namespace ngbla
     */
     
     Vec (const Vec &) = default;
-    auto & HTData() const { return data; }                                    
+    auto & HTData() { return data; }
+    const auto & HTData() const { return data; }                                        
     template <typename T2>
     Vec (const Vec<S,T2> & v2) : data(v2.HTData()) { ; }
 
@@ -1196,10 +1197,22 @@ namespace ngbla
     for (int i = 0; i < DIM; i++)
       AtomicAdd (x(i), y(i));
   }
-  
 
+
+  template <typename T, typename TS, typename TDIST, typename TB>
+  inline void AtomicAdd (VectorView<T,TS,TDIST> v, const Expr<TB> & v2)
+  {
+    auto viewv2 = v2.View();
+    auto combsize = CombinedSize(v.Size(), v2.Height());
+    for (size_t i = 0; i < combsize; i++)
+      AtomicAdd (v(i), viewv2(i));
+  }
+
+  
 }
 
+
+
 namespace ngstd
 {
   template <typename ARCHIVE, int S, typename T>

ngsolve/__init__.pyi

@@ -219,7 +219,7 @@ TET: fem.ET  # value = <ET.TET: 20>
 TRIG: fem.ET  # value = <ET.TRIG: 10>
 VERTEX: fem.NODE_TYPE  # value = <NODE_TYPE.VERTEX: 0>
 VOL: comp.VorB  # value = <VorB.VOL: 0>
-__version__: str = '6.2.2505-17-g2593d4c47'
+__version__: str = '6.2.2505-94-geb7c3f7d9'
 ds: comp.DifferentialSymbol  # value = <ngsolve.comp.DifferentialSymbol object>
 dx: comp.DifferentialSymbol  # value = <ngsolve.comp.DifferentialSymbol object>
 ngsglobals: comp.GlobalVariables  # value = <ngsolve.comp.GlobalVariables object>

ngsolve/cmake/NGSolveConfig.cmake

@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION "6.2.2505-17-g2593d4c47")
+set(PACKAGE_VERSION "6.2.2505-94-geb7c3f7d9")
 find_package(Netgen CONFIG REQUIRED HINTS
   ${CMAKE_CURRENT_LIST_DIR}
   ${CMAKE_CURRENT_LIST_DIR}/..

ngsolve/config/__init__.pyi

@@ -24,14 +24,14 @@ NGSOLVE_INSTALL_DIR_INCLUDE: str = 'netgen/include'
 NGSOLVE_INSTALL_DIR_LIB: str = 'netgen'
 NGSOLVE_INSTALL_DIR_PYTHON: str = '.'
 NGSOLVE_INSTALL_DIR_RES: str = 'share'
-NGSOLVE_VERSION: str = '6.2.2505-17-g2593d4c47'
-NGSOLVE_VERSION_GIT: str = 'v6.2.2505-17-g2593d4c47'
-NGSOLVE_VERSION_HASH: str = 'g2593d4c47'
+NGSOLVE_VERSION: str = '6.2.2505-94-geb7c3f7d9'
+NGSOLVE_VERSION_GIT: str = 'v6.2.2505-94-geb7c3f7d9'
+NGSOLVE_VERSION_HASH: str = 'geb7c3f7d9'
 NGSOLVE_VERSION_MAJOR: str = '6'
 NGSOLVE_VERSION_MINOR: str = '2'
 NGSOLVE_VERSION_PATCH: str = '2505'
-NGSOLVE_VERSION_PYTHON: str = '6.2.2505.post17.dev0'
-NGSOLVE_VERSION_TWEAK: str = '17'
+NGSOLVE_VERSION_PYTHON: str = '6.2.2505.post94.dev0'
+NGSOLVE_VERSION_TWEAK: str = '94'
 USE_CCACHE: bool = True
 USE_HYPRE: bool = False
 USE_LAPACK: bool = True
@@ -40,4 +40,4 @@ USE_MUMPS: bool = False
 USE_PARDISO: bool = False
 USE_UMFPACK: bool = True
 is_python_package: bool = True
-version: str = 'v6.2.2505-17-g2593d4c47'
+version: str = 'v6.2.2505-94-geb7c3f7d9'

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.2505-17-g2593d4c47"
-NGSOLVE_VERSION_GIT = "v6.2.2505-17-g2593d4c47"
-NGSOLVE_VERSION_PYTHON = "6.2.2505.post17.dev0"
+NGSOLVE_VERSION = "6.2.2505-94-geb7c3f7d9"
+NGSOLVE_VERSION_GIT = "v6.2.2505-94-geb7c3f7d9"
+NGSOLVE_VERSION_PYTHON = "6.2.2505.post94.dev0"
 
 NGSOLVE_VERSION_MAJOR = "6"
 NGSOLVE_VERSION_MINOR = "2"
-NGSOLVE_VERSION_TWEAK = "17"
+NGSOLVE_VERSION_TWEAK = "94"
 NGSOLVE_VERSION_PATCH = "2505"
-NGSOLVE_VERSION_HASH = "g2593d4c47"
+NGSOLVE_VERSION_HASH = "geb7c3f7d9"
 
 CMAKE_CXX_COMPILER           = "/Library/Developer/CommandLineTools/usr/bin/c++"
 CMAKE_CUDA_COMPILER          = ""

ngsolve/config/config.pyi

@@ -26,14 +26,14 @@ NGSOLVE_INSTALL_DIR_INCLUDE: str = 'netgen/include'
 NGSOLVE_INSTALL_DIR_LIB: str = 'netgen'
 NGSOLVE_INSTALL_DIR_PYTHON: str = '.'
 NGSOLVE_INSTALL_DIR_RES: str = 'share'
-NGSOLVE_VERSION: str = '6.2.2505-17-g2593d4c47'
-NGSOLVE_VERSION_GIT: str = 'v6.2.2505-17-g2593d4c47'
-NGSOLVE_VERSION_HASH: str = 'g2593d4c47'
+NGSOLVE_VERSION: str = '6.2.2505-94-geb7c3f7d9'
+NGSOLVE_VERSION_GIT: str = 'v6.2.2505-94-geb7c3f7d9'
+NGSOLVE_VERSION_HASH: str = 'geb7c3f7d9'
 NGSOLVE_VERSION_MAJOR: str = '6'
 NGSOLVE_VERSION_MINOR: str = '2'
 NGSOLVE_VERSION_PATCH: str = '2505'
-NGSOLVE_VERSION_PYTHON: str = '6.2.2505.post17.dev0'
-NGSOLVE_VERSION_TWEAK: str = '17'
+NGSOLVE_VERSION_PYTHON: str = '6.2.2505.post94.dev0'
+NGSOLVE_VERSION_TWEAK: str = '94'
 USE_CCACHE: bool = True
 USE_HYPRE: bool = False
 USE_LAPACK: bool = True
@@ -42,4 +42,4 @@ USE_MUMPS: bool = False
 USE_PARDISO: bool = False
 USE_UMFPACK: bool = True
 is_python_package: bool = True
-version: str = 'v6.2.2505-17-g2593d4c47'
+version: str = 'v6.2.2505-94-geb7c3f7d9'

ngsolve/directsolvers.pyi

@@ -9,7 +9,7 @@ import typing
 __all__ = ['BaseMatrix', 'BaseVector', 'BilinearForm', 'BitArray', 'SuperLU']
 class SuperLU(ngsolve.la.BaseMatrix):
     __firstlineno__: typing.ClassVar[int] = 3
-    __static_attributes__: typing.ClassVar[tuple] = ('a', 'fd', 'lu', 'freedofs')
+    __static_attributes__: typing.ClassVar[tuple] = ('freedofs', 'fd', 'lu', 'a')
     def Mult(self, x: ngsolve.la.BaseVector, y: ngsolve.la.BaseVector):
         ...
     def Update(self):

ngsolve/fem.pyi

@@ -187,7 +187,7 @@ class BSpline2D:
     
     """
     @typing.overload
-    def __call__(self, x: float, y: float) -> float:
+    def __call__(self, x: numpy.ndarray[numpy.float64], y: numpy.ndarray[numpy.float64]) -> typing.Any:
         ...
     @typing.overload
     def __call__(self, cx: CoefficientFunction, cy: CoefficientFunction) -> CoefficientFunction:

ngsolve/krylovspace.pyi

@@ -35,7 +35,7 @@ class CGSolver(LinearSolver):
         ...
 class GMResSolver(LinearSolver):
     __firstlineno__: typing.ClassVar[int] = 740
-    __static_attributes__: typing.ClassVar[tuple] = ('iterations', 'restart', 'norm', 'innerproduct')
+    __static_attributes__: typing.ClassVar[tuple] = ('restart', 'norm', 'iterations', 'innerproduct')
     name: typing.ClassVar[str] = 'GMRes'
     def _SolveImpl(self, rhs: ngsolve.la.BaseVector, sol: ngsolve.la.BaseVector):
         ...
@@ -43,7 +43,7 @@ class GMResSolver(LinearSolver):
         ...
 class LinearSolver(ngsolve.la.BaseMatrix):
     __firstlineno__: typing.ClassVar[int] = 50
-    __static_attributes__: typing.ClassVar[tuple] = ('ress', 'sol', 'display', 'callback', 'plt', 'tol', 'its', 'atol', '_final_residual', 'pre', 'clear_output', 'maxiter', 'residuals', 'plotrates', 'mat', 'printrates', 'iterations', 'callback_sol', 'fig', 'ax')
+    __static_attributes__: typing.ClassVar[tuple] = ('its', 'tol', 'plotrates', 'callback_sol', 'display', 'pre', 'callback', 'residuals', 'clear_output', 'plt', 'sol', 'atol', '_final_residual', 'ax', 'maxiter', 'mat', 'ress', 'fig', 'printrates', 'iterations')
     name: typing.ClassVar[str] = 'LinearSolver'
     @staticmethod
     def Solve(*args, **kwargs):

ngsolve/nonlinearsolvers.pyi

@@ -8,7 +8,7 @@ import typing
 __all__ = ['InnerProduct', 'Newton', 'NewtonMinimization', 'NewtonSolver', 'Norm', 'Projector', 'TimeFunction', 'sqrt']
 class NewtonSolver:
     __firstlineno__: typing.ClassVar[int] = 6
-    __static_attributes__: typing.ClassVar[tuple] = ('rhs', 'uh', 'w', 'inverse', 'lin_solver_args', 'a', 'u', 'lin_solver_cls', 'r', 'inv', 'freedofs')
+    __static_attributes__: typing.ClassVar[tuple] = ('freedofs', 'r', 'a', 'inverse', 'inv', 'w', 'uh', 'lin_solver_args', 'u', 'rhs', 'lin_solver_cls')
     @staticmethod
     def Solve(*args, **kwargs):
         ...

ngsolve/solve_implementation.pyi

@@ -14,7 +14,7 @@ __all__ = ['Application', 'BND', 'BilinearForm', 'CoefficientFunction', 'Dirichl
 class Application:
     __firstlineno__: typing.ClassVar[int] = 21
     __hash__: typing.ClassVar[None] = None
-    __static_attributes__: typing.ClassVar[tuple] = ('a', 'gf')
+    __static_attributes__: typing.ClassVar[tuple] = ('gf', 'a')
     def Solve(self, rhs, *args, dirichlet = None, pre = None, printrates: bool = False, **kwargs):
         ...
     def __eq__(self, other):
@@ -28,7 +28,7 @@ class Dirichlet:
         ...
 class Equation:
     __firstlineno__: typing.ClassVar[int] = 134
-    __static_attributes__: typing.ClassVar[tuple] = ('lhs', 'rhs')
+    __static_attributes__: typing.ClassVar[tuple] = ('rhs', 'lhs')
     def Solve(self, *args, **kwargs):
         ...
     def __init__(self, lhs, rhs):

ngsolve/timestepping.pyi

@@ -7,7 +7,7 @@ import typing
 __all__ = ['CrankNicolson', 'ImplicitEuler', 'Newmark', 'ngs']
 class CrankNicolson:
     __firstlineno__: typing.ClassVar[int] = 129
-    __static_attributes__: typing.ClassVar[tuple] = ('dt', 'c', 'time', '_lin_solver_args', '_lin_solver_cls', 'bfmstar', 'gfu_old')
+    __static_attributes__: typing.ClassVar[tuple] = ('dt', '_lin_solver_cls', 'time', 'c', '_lin_solver_args', 'bfmstar', 'gfu_old')
     def Integrate(self, u_start: ngsolve.comp.GridFunction, end_time: float, start_time: typing.Optional[float] = None, newton_args: typing.Optional[dict] = None, callback: typing.Optional[typing.Callable] = None):
         ...
     def Step(self, u: ngsolve.comp.GridFunction, dt: typing.Optional[float] = None, newton_args: typing.Optional[dict] = None):
@@ -16,7 +16,7 @@ class CrankNicolson:
         ...
 class ImplicitEuler:
     __firstlineno__: typing.ClassVar[int] = 5
-    __static_attributes__: typing.ClassVar[tuple] = ('dt', 'c', 'time', '_lin_solver_args', '_lin_solver_cls', 'bfmstar', 'gfu_old')
+    __static_attributes__: typing.ClassVar[tuple] = ('dt', '_lin_solver_cls', 'time', 'c', '_lin_solver_args', 'bfmstar', 'gfu_old')
     def Integrate(self, u_start: ngsolve.comp.GridFunction, end_time: float, start_time: typing.Optional[float] = None, newton_args: typing.Optional[dict] = None, callback: typing.Optional[typing.Callable] = None):
         ...
     def Step(self, u: ngsolve.comp.GridFunction, dt: typing.Optional[float] = None, newton_args: typing.Optional[dict] = None):
@@ -25,7 +25,7 @@ class ImplicitEuler:
         ...
 class Newmark:
     __firstlineno__: typing.ClassVar[int] = 58
-    __static_attributes__: typing.ClassVar[tuple] = ('dt', 'c', 'time', 'gfv_old', 'gfa_old', '_lin_solver_args', '_lin_solver_cls', 'bfmstar', 'gfu_old')
+    __static_attributes__: typing.ClassVar[tuple] = ('dt', '_lin_solver_cls', 'time', 'gfa_old', 'c', '_lin_solver_args', 'bfmstar', 'gfu_old', 'gfv_old')
     def Integrate(self, u: ngsolve.comp.GridFunction, end_time: float, v: typing.Optional[ngsolve.comp.GridFunction] = None, a: typing.Optional[ngsolve.comp.GridFunction] = None, start_time: typing.Optional[float] = None, newton_args: typing.Optional[dict] = None, callback: typing.Optional[typing.Callable] = None):
         ...
     def Step(self, u: ngsolve.comp.GridFunction, v: ngsolve.comp.GridFunction, a: ngsolve.comp.GridFunction, dt: typing.Optional[float] = None, newton_args: typing.Optional[dict] = None):

ngsolve/timing.pyi

@@ -32,7 +32,7 @@ class Timing:
     
     """
     __firstlineno__: typing.ClassVar[int] = 5
-    __static_attributes__: typing.ClassVar[tuple] = ('timings', 'timings_par', 'name')
+    __static_attributes__: typing.ClassVar[tuple] = ('timings', 'name', 'timings_par')
     def CompareTo(self, folder):
         """
         

{ngsolve-6.2.2505.post17.dev0.dist-info → ngsolve-6.2.2505.post94.dev0.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: ngsolve
-Version: 6.2.2505.post17.dev0
+Version: 6.2.2505.post94.dev0
 Summary: NGSolve
 Author: The NGSolve team
 License: LGPL2.1
 License-File: LICENSE
-Requires-Dist: netgen-mesher==6.2.2505.post3.dev0
+Requires-Dist: netgen-mesher==6.2.2505.post45.dev0