ngstrefftz 0.3.2403.dev14__tar.gz → 0.3.2403.dev17__tar.gz

{ngstrefftz-0.3.2403.dev14 → ngstrefftz-0.3.2403.dev17}/.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
         with:
           python-version: '3.12'
       - name: install ngstrefftz
-        run: cd NGSTrefftz && pip install . && pip install numpy
+        run: cd NGSTrefftz && pip install numpy mkl-devel==2024.* mkl==2024.* && pip install . 
       - name: run test
         run: cd $GITHUB_WORKSPACE/NGSTrefftz/test && python3 -m doctest -v *.py
 
@@ -50,6 +50,8 @@ jobs:
           fetch-depth: 0
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.19.0
+        env:
+          CIBW_BUILD_VERBOSITY: 1
       - uses: actions/upload-artifact@v4
         with:
           name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}

{ngstrefftz-0.3.2403.dev14 → ngstrefftz-0.3.2403.dev17}/CMakeLists.txt

@@ -78,6 +78,17 @@ if (NGSTREFFTZ_USE_MKL)
         set(MKL_LINK dynamic)
       endif()
     endif()
+    #execute_process(COMMAND ${Python3_EXECUTABLE} -c "import sys; print(sys.prefix)"
+        #OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE rootdir)
+    #if(WIN32)
+        #set(MKL_ROOT ${rootdir})
+        #set(MKL_LIBRARY ${rootdir}/Library/lib/mkl_rt.lib)
+        #set(MKL_INCLUDE_DIR ${rootdir}/Library/include)
+    #elseif(UNIX AND NOT APPLE)
+        #set(MKL_ROOT ${rootdir})
+        #set(MKL_LIBRARY ${rootdir}/lib/libmkl_rt.so.2)
+        #set(MKL_INCLUDE_DIR ${rootdir}/include)
+    #endif()
     find_package(MKL) # HINTS ${MKL_ROOT} ${CMAKE_INSTALL_PREFIX}/../../cmake/mkl ${Python3_ROOT_DIR}/lib/cmake/mkl)
     #message("MKL minimal: ${MKL_MINIMAL_LIBRARIES}")
     #message("MKL libraries: ${MKL_LIBRARIES}")

{ngstrefftz-0.3.2403.dev14 → ngstrefftz-0.3.2403.dev17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ngstrefftz
-Version: 0.3.2403.dev14
+Version: 0.3.2403.dev17
 Summary: NGSTrefftz is an add-on to NGSolve for Trefftz methods.
 Author-Email: Paul Stocker <paul.stocker@univie.ac.at>
 License: LGPL2.1

{ngstrefftz-0.3.2403.dev14 → ngstrefftz-0.3.2403.dev17}/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.2403.dev14'
-__version_tuple__ = version_tuple = (0, 3, 2403, 'dev14')
+__version__ = version = '0.3.2403.dev17'
+__version_tuple__ = version_tuple = (0, 3, 2403, 'dev17')

{ngstrefftz-0.3.2403.dev14 → ngstrefftz-0.3.2403.dev17}/docs/requirements.txt

@@ -21,5 +21,5 @@ numpy==1.26.4
 scipy==1.13.1 
 ngsolve>=6.2.2404
 xfem>=2.1.2404
-ngstrefftz>=0.2.2402
+ngstrefftz>=0.3.2403.dev16
 webgui-jupyter-widgets==0.2.33

{ngstrefftz-0.3.2403.dev14 → ngstrefftz-0.3.2403.dev17}/pyproject.toml

@@ -15,7 +15,7 @@ Documentation = "https://paulst.github.io/NGSTrefftz"
 Repository = "https://github.com/PaulSt/ngstrefftz"
 
 [build-system]
-requires = ["setuptools>=45", "setuptools_scm[toml]>=8", "toml", "scikit-build-core>=0.3.3", "pybind11_stubgen", "cmake>=3.26.1", "ngsolve>=6.2.2404"]
+requires = ["setuptools>=45", "setuptools_scm[toml]>=8", "toml", "scikit-build-core>=0.3.3", "pybind11_stubgen", "cmake>=3.26.1", "ngsolve>=6.2.2404", 'mkl-devel>=2024 ; platform_system != "Darwin"']
 build-backend = "scikit_build_core.build"
 
 [tool.scikit-build]

{ngstrefftz-0.3.2403.dev14 → ngstrefftz-0.3.2403.dev17}/src/trefftzfespace.cpp

@@ -298,12 +298,19 @@ namespace ngcomp
 
     if (ei.IsVolume ())
       {
+        if (!DefinedOn (ngel))
+          {
+            return SwitchET(eltype,
+                            [&alloc] (auto et) -> FiniteElement&
+                            { return *new(alloc) ScalarDummyFE<et.ElementType()>(); });
+          }
+
         switch (ma->GetElType (ei))
           {
           case ET_POINT:
           case ET_SEGM:
             {
-              throw Exception ("illegal dim for space-time element");
+              //throw Exception ("illegal dim for space-time element");
               break;
             }
           case ET_QUAD:
@@ -469,7 +476,7 @@ namespace ngcomp
       }
     catch (Exception &e)
       {
-        throw Exception ("illegal element type in Trefftz::GetSurfaceFE");
+        throw Exception ("illegal element type in Trefftz::GetFE");
       }
   }