ngsolve 6.2.2502__cp39-cp39-macosx_10_15_universal2.whl → 6.2.2504__cp39-cp39-macosx_10_15_universal2.whl

netgen/include/sparsematrix_impl.hpp

@@ -51,28 +51,94 @@ namespace ngla
                  FlatArray<TM> val, size_t h, size_t w)
   {
     static Timer t("SparseMatrix::CreateFromCOO"); RegionTimer r(t);
-    Array<int> cnt(h);
+    static Timer t1("SparseMatrix::CreateFromCOO 1");
+    static Timer t2("SparseMatrix::CreateFromCOO 2");
+    static Timer t3("SparseMatrix::CreateFromCOO 3");
 
     /*
-    cnt = 0;
-    for (auto i : indi) cnt[i]++;
-    */
+    {
+    Array<int> cnt(h);
 
+    t1.Start();
     DynamicTable<int> tab(h);
     for (size_t i = 0; i < indi.Size(); i++)
       tab.AddUnique(indi[i], indj[i]);
+    t1.Stop();
     for (size_t i = 0; i < h; i++)
       cnt[i] = tab.EntrySize(i);
     
     auto matrix = make_shared<SparseMatrix<TM>> (cnt, w);
+    t2.Start();
     for (auto k : ngstd::Range(indi))
       matrix->CreatePosition(indi[k], indj[k]);
+    t2.Stop();
     matrix->SetZero();
 
+    t3.Start();
     for (auto k : ngstd::Range(indi))
       (*matrix)(indi[k], indj[k]) += val[k];
+    t3.Stop();
+    // return matrix;
+    }
+    */
+    
+    Array<int> cnt(h);
+    cnt = 0;
+    for (auto i : indi)
+      cnt[i]++;
+    
+    Table<int> tab(cnt);
+    cnt = 0;
+    
+    for (auto [i,j] : Zip(indi, indj))
+      tab[i][cnt[i]++] = j;
+
+    cnt = 0;
+    // for (int i = 0; i < tab.Size(); i++)
+    ParallelFor (tab.Size(), [&] (size_t i)
+      {
+        QuickSort (tab[i]);
+
+        int prev = -1;
+        for (auto j : tab[i])
+          {
+            if (j != prev) cnt[i]++;
+            prev = j;
+          }
+      });
+    
+    auto matrix = make_shared<SparseMatrix<TM>> (cnt, w);
+    t2.Start();
+    // for (auto k : ngstd::Range(indi))
+    // matrix->CreatePosition(indi[k], indj[k]);
 
-    return matrix;
+    cnt = 0;
+    for (int i = 0; i < tab.Size(); i++)
+      {
+        int prev = -1;
+        for (auto j : tab[i])
+          {
+            auto cols = matrix->GetRowIndices(i);
+            if (j != prev)
+              cols[cnt[i]++] = j;
+            prev = j;
+          }
+      }
+    
+    t2.Stop();
+    matrix->SetZero();
+
+    t3.Start();
+    /*
+    for (auto k : ngstd::Range(indi))
+      (*matrix)(indi[k], indj[k]) += val[k];
+    */
+    ParallelFor (indi.Size(), [&](size_t k)
+    {
+      AtomicAdd ( (*matrix)(indi[k], indj[k]),  val[k]);
+    });
+    t3.Stop();
+    return matrix;    
   }
   
 

netgen/include/symbolicintegrator.hpp

@@ -604,6 +604,7 @@ public:
 
   class SymbolicFacetLinearFormIntegrator : public FacetLinearFormIntegrator
   {
+  protected:
     shared_ptr<CoefficientFunction> cf;
     Array<ProxyFunction*> proxies;
     Array<CoefficientFunction*> cache_cfs;

netgen/include/tangentialfacetfespace.hpp

@@ -16,34 +16,22 @@ namespace ngcomp
   class NGS_DLL_HEADER TangentialFacetFESpace : public FESpace
   {
   protected:
-    /// Level
-    // int level;
-    /// Number of Facets
-    // int nfacets;
-    /// 
-    // int ncfacets;
-    ///
-    // int nel;
-
     Array<int> first_facet_dof;
     Array<int> first_inner_dof;  // for highest_order_dc
-    // int ndof_lo;
 
     int rel_order;
 
     Array<IVec<2> > order_facet;
     Array<bool> fine_facet;
 
-    // int ndof;
-    // Array<int> ndlevel;
     bool var_order;
     bool print;
 
     bool highest_order_dc;
     bool hide_highest_order_dc;
+    bool all_dofs_together;
     
   public:
-    ///
     TangentialFacetFESpace (shared_ptr<MeshAccess> ama, const Flags & flags, 
                             bool parseflags = false );
 
@@ -61,20 +49,11 @@ namespace ngcomp
     virtual void SetOrder (NodeId ni, int order) override;
     virtual int GetOrder (NodeId ni) const override;
 
-    
-    // virtual size_t GetNDof() const throw() override { return ndof; }
-    // virtual size_t GetNDofLevel ( int i ) const override { return ndlevel[i]; }
-
     virtual FlatArray<VorB> GetDualShapeNodes (VorB vb) const override;
 
-    // virtual int GetNDofLowOrder () const
-    // { return ndof_lo; }
 
     virtual FiniteElement & GetFE(ElementId ei, Allocator & lh) const override;
     
-    // virtual const FiniteElement & GetFE ( int elnr, LocalHeap & lh ) const;
-    // virtual const FiniteElement & GetSFE ( int selnr, LocalHeap & lh ) const;
-
     virtual void GetFacetDofNrs (int felnr, Array<DofId> & dnums) const;
 
     virtual int GetNFacetDofs (int felnr) const;
@@ -90,6 +69,12 @@ namespace ngcomp
     virtual IVec<2> GetFacetOrder(int fnr) const;
 
     virtual int GetFirstFacetDof(int fanr) const;
+    const auto & GetFirstFacetDof() const { return first_facet_dof; }
+
+    IntRange GetFacetDofs (int nr) const
+    { 
+      return IntRange (first_facet_dof[nr], first_facet_dof[nr+1]); 
+    }
 
     virtual bool UsesHighestOrderDiscontinuous() const {return highest_order_dc;};
 

ngsolve/__init__.py

@@ -75,6 +75,7 @@ from .utils import x, y, z, dx, ds, grad, Grad, curl, div, Deviator, PyId, PyTra
 from . import solvers
 from . import preconditioners
 from . import timestepping
+from .solve_implementation import Solve
 
 try:
     from netgen.occ import unit_square, unit_cube

ngsolve/cmake/NGSolveConfig.cmake

@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION "6.2.2502")
+set(PACKAGE_VERSION "6.2.2504")
 find_package(Netgen CONFIG REQUIRED HINTS
   ${CMAKE_CURRENT_LIST_DIR}
   ${CMAKE_CURRENT_LIST_DIR}/..
@@ -23,15 +23,15 @@ set(NGSOLVE_PYBIND_INCLUDE_DIR "")
 set(NGSOLVE_PYTHON_INCLUDE_DIRS "/Library/Frameworks/Python.framework/Versions/3.9/include/python3.9")
 set(NGSOLVE_PYTHON_LIBRARIES "/Library/Frameworks/Python.framework/Versions/3.9/lib/libpython3.9.dylib")
 set(NGSOLVE_PYTHON_PACKAGES_INSTALL_DIR  "")
-set(NGSOLVE_TCL_INCLUDE_PATH "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/macosx-10.15-universal2-3.9/cmake-build/dependencies/src/project_tcl/generic")
+set(NGSOLVE_TCL_INCLUDE_PATH "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/netgen/_skbuild/macosx-10.15-universal2-3.9/cmake-build/dependencies/src/project_tcl/generic")
 set(NGSOLVE_TCL_LIBRARY "/Library/Frameworks/Python.framework/Versions/3.9/lib/libtclstub8.6.a")
 set(NGSOLVE_TK_DND_LIBRARY "")
-set(NGSOLVE_TK_INCLUDE_PATH "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/macosx-10.15-universal2-3.9/cmake-build/dependencies/src/project_tk/generic")
+set(NGSOLVE_TK_INCLUDE_PATH "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/netgen/_skbuild/macosx-10.15-universal2-3.9/cmake-build/dependencies/src/project_tk/generic")
 set(NGSOLVE_TK_LIBRARY "/Library/Frameworks/Python.framework/Versions/3.9/lib/libtkstub8.6.a")
 set(NGSOLVE_X11_X11_LIB "")
 set(NGSOLVE_X11_Xmu_LIB "")
-set(NGSOLVE_ZLIB_INCLUDE_DIRS "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/macosx-10.15-universal2-3.9/cmake-build/dependencies/zlib/include")
-set(NGSOLVE_ZLIB_LIBRARIES "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/macosx-10.15-universal2-3.9/cmake-build/dependencies/zlib/lib/libz.a")
+set(NGSOLVE_ZLIB_INCLUDE_DIRS "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/netgen/_skbuild/macosx-10.15-universal2-3.9/cmake-build/dependencies/zlib/include")
+set(NGSOLVE_ZLIB_LIBRARIES "/Users/gitlab-runner/builds/builds/rL7WHzyj/0/ngsolve/netgen/_skbuild/macosx-10.15-universal2-3.9/cmake-build/dependencies/zlib/lib/libz.a")
 
 set(NGSOLVE_INTEL_MIC       OFF)
 set(NGSOLVE_USE_CCACHE ON)

ngsolve/cmake/ngsolve-targets-release.cmake

@@ -45,6 +45,16 @@ set_target_properties(ngfem PROPERTIES
 list(APPEND _cmake_import_check_targets ngfem )
 list(APPEND _cmake_import_check_files_for_ngfem "${_IMPORT_PREFIX}/netgen/libngfem.dylib" )
 
+# Import target "ngsbem" for configuration "Release"
+set_property(TARGET ngsbem APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(ngsbem PROPERTIES
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/netgen/libngsbem.dylib"
+  IMPORTED_SONAME_RELEASE "@rpath/libngsbem.dylib"
+  )
+
+list(APPEND _cmake_import_check_targets ngsbem )
+list(APPEND _cmake_import_check_files_for_ngsbem "${_IMPORT_PREFIX}/netgen/libngsbem.dylib" )
+
 # Import target "ngcomp" for configuration "Release"
 set_property(TARGET ngcomp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
 set_target_properties(ngcomp PROPERTIES

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 netgen_python ngstd ngbla ngla ngfem ngcomp ngsolve)
+foreach(_cmake_expected_target IN ITEMS netgen_libs ngs_lapack netgen_python 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}")
@@ -105,6 +105,13 @@ set_target_properties(ngfem PROPERTIES
   INTERFACE_LINK_LIBRARIES "ngbla;ngstd"
 )
 
+# Create imported target ngsbem
+add_library(ngsbem SHARED IMPORTED)
+
+set_target_properties(ngsbem PROPERTIES
+  INTERFACE_LINK_LIBRARIES "ngcomp;ngfem;ngla;ngbla;ngstd"
+)
+
 # Create imported target ngcomp
 add_library(ngcomp SHARED IMPORTED)
 
@@ -116,7 +123,7 @@ set_target_properties(ngcomp PROPERTIES
 add_library(ngsolve SHARED IMPORTED)
 
 set_target_properties(ngsolve PROPERTIES
-  INTERFACE_LINK_LIBRARIES "netgen_libs;ngsolve;ngcomp;ngfem;ngbla;ngla;ngstd"
+  INTERFACE_LINK_LIBRARIES "netgen_libs;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.2502"
-NGSOLVE_VERSION_GIT = "v6.2.2502-0-g984bf8ae2"
-NGSOLVE_VERSION_PYTHON = "6.2.2502"
+NGSOLVE_VERSION = "6.2.2504"
+NGSOLVE_VERSION_GIT = "v6.2.2504-0-g7dd7ba8dd"
+NGSOLVE_VERSION_PYTHON = "6.2.2504"
 
 NGSOLVE_VERSION_MAJOR = "6"
 NGSOLVE_VERSION_MINOR = "2"
 NGSOLVE_VERSION_TWEAK = "0"
-NGSOLVE_VERSION_PATCH = "2502"
-NGSOLVE_VERSION_HASH = "g984bf8ae2"
+NGSOLVE_VERSION_PATCH = "2504"
+NGSOLVE_VERSION_HASH = "g7dd7ba8dd"
 
 CMAKE_CXX_COMPILER           = "/Library/Developer/CommandLineTools/usr/bin/c++"
 CMAKE_CUDA_COMPILER          = ""

ngsolve/solve_implementation.py

@@ -0,0 +1,146 @@
+import functools
+
+from ngsolve import (
+    BilinearForm,
+    GridFunction,
+    CoefficientFunction,
+    Region,
+    BND,
+    Preconditioner,
+)
+from .nonlinearsolvers import NewtonSolver
+from .krylovspace import GMResSolver, LinearSolver
+
+
+class Dirichlet:
+    def __init__(self, cf, region):
+        self.cf = cf
+        self.region = region
+
+
+class Application:
+    def __init__(self, a: BilinearForm, gf: GridFunction):
+        self.a = a
+        self.gf = gf
+
+    def Solve(
+        self,
+        rhs,
+        *args,
+        dirichlet = None,
+        pre = None,
+        printrates: bool = False,
+        **kwargs,
+    ):
+        raise NotImplementedError("Solve method must be implemented in subclasses")
+
+    def __eq__(self, other):
+        return Equation(self, other)
+
+
+class NonLinearApplication(Application):
+    def Solve(
+        self,
+        rhs=None,
+        dirichlet = None,
+        printing: bool = False,
+        **kwargs,
+    ):
+        solver_args = {}
+
+        if rhs is not None and rhs != 0:
+            rhs.Assemble()
+            solver_args["rhs"] = rhs
+        solver = NewtonSolver(self.a, self.gf, **solver_args)
+        if dirichlet is not None:
+            dirichlet_gf = GridFunction(self.gf.space)
+            if isinstance(dirichlet, Dirichlet):
+                dirichlet_gf.Set(dirichlet.cf, definedon=dirichlet.region)
+            else:
+                dirichlet_gf.Set(dirichlet, BND)
+            solver.SetDirichlet(dirichlet_gf.vec)
+        solver.Solve(**kwargs)
+
+
+class LinearApplication(Application):
+    def Assemble(self):
+        if not hasattr(self, "vec"):
+            self.vec = self.gf.vec.CreateVector()
+        self.a.Apply(self.gf.vec, self.vec)
+
+    def Solve(
+        self,
+        rhs,
+        *args,
+        dirichlet = None,
+        pre = None,
+        lin_solver=None,
+        lin_solver_args = None,
+        printrates: bool = False,
+    ):
+        self.a.Assemble()
+        for arg in args:
+            if isinstance(arg, Dirichlet) or isinstance(arg, CoefficientFunction):
+                assert dirichlet is None, "Only one dirichlet condition can be set"
+                dirichlet = arg
+            if isinstance(arg, Preconditioner):
+                assert pre is None, "Only one preconditioner can be set"
+                pre = arg
+            if isinstance(arg, type) and issubclass(arg, LinearSolver):
+                assert lin_solver is None, "Only one linear solver can be set"
+                lin_solver = arg
+        rhs.Assemble()
+        if dirichlet is not None:
+            if isinstance(dirichlet, Dirichlet):
+                self.gf.Set(dirichlet.cf, definedon=dirichlet.region)
+            else:
+                self.gf.Set(dirichlet, BND)
+            rhs.vec.data += -self.a.mat * self.gf.vec
+        else:
+            self.gf.vec[:] = 0.0
+        if self.a.condense:
+            rhs.vec.data += self.a.harmonic_extension_trans * rhs.vec
+        if pre is None and lin_solver is None:
+            ainv = self.a.mat.Inverse(self.a.space.FreeDofs(self.a.condense))
+        else:
+            if lin_solver is None:
+                lin_solver = GMResSolver
+            if lin_solver_args is None:
+                lin_solver_args = {}
+            if pre is None:
+                freedofs = self.a.space.FreeDofs(self.a.condense)
+            else:
+                freedofs = None
+            if "printrates" not in lin_solver_args:
+                lin_solver_args["printrates"] = printrates
+            ainv = lin_solver(
+                mat=self.a.mat, pre=pre, freedofs=freedofs, **lin_solver_args
+            )
+        self.gf.vec.data += ainv * rhs.vec
+        if self.a.condense:
+            self.gf.vec.data += self.a.harmonic_extension * self.gf.vec
+            self.gf.vec.data += self.a.inner_solve * rhs.vec
+
+
+class Equation:
+    def __init__(self, lhs, rhs):
+        self.lhs = lhs
+        self.rhs = rhs
+
+    @functools.wraps(Application.Solve)
+    def Solve(self, *args, **kwargs):
+        self.lhs.Solve(self.rhs, *args, **kwargs)
+
+
+def _create_lin_appl(self, gfu: GridFunction) -> LinearApplication:
+    if not isinstance(gfu, GridFunction):
+        raise TypeError("gfu must be a GridFunction")
+    return LinearApplication(self, gfu)
+
+
+BilinearForm.__mul__ = _create_lin_appl
+
+
+@functools.wraps(Application.Solve)
+def Solve(eq: Equation, *args, **kwargs):
+    eq.Solve(*args, **kwargs)

{ngsolve-6.2.2502.dist-info → ngsolve-6.2.2504.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: ngsolve
-Version: 6.2.2502
+Version: 6.2.2504
 Summary: NGSolve
 Home-page: UNKNOWN
 Author: The NGSolve team
 License: LGPL2.1
 Platform: UNKNOWN
 License-File: LICENSE
-Requires-Dist: netgen-mesher (==6.2.2501.post54.dev0)
+Requires-Dist: netgen-mesher (==6.2.2504)
 
 UNKNOWN