ngstrefftz 0.3.2607.dev11__tar.gz → 0.3.2607.dev15__tar.gz

ngstrefftz-0.3.2607.dev15/.github/workflows/build.yml

@@ -0,0 +1,261 @@
+name: build
+
+on:
+  workflow_dispatch:
+    inputs:
+      ngsolve_version:
+        description: NGSolve version (empty builds the current checkout)
+        type: string
+      dry_run:
+        description: Build and test without uploading to PyPI
+        type: boolean
+        default: true
+      level:
+        description: 'build level'
+        required: true
+        default: 'full'
+        type: choice
+        options:
+          - quick
+          - full
+  push:
+    branches: [main, main-dev]
+  release:
+    types: [published]
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
+
+jobs:
+  prepare:
+    name: Prepare release
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.release.outputs.version }}
+      published: ${{ steps.release.outputs.published }}
+    steps:
+      - uses: actions/checkout@v6
+        if: inputs.ngsolve_version != ''
+        with:
+          fetch-depth: 0
+      - uses: PaulSt/ngsolve-release-watcher@main
+        id: release
+        with:
+          ngsolve_version: ${{ inputs.ngsolve_version }}
+          dry_run: ${{ inputs.dry_run }}
+      - uses: actions/upload-artifact@v7
+        if: inputs.ngsolve_version != ''
+        with:
+          name: release-pyproject
+          path: pyproject.toml
+
+  check_formatting:
+    name: Check Formatting with Clang Format
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          path: "NGSTrefftz"
+          fetch-depth: 0
+      - uses: RafikFarhad/clang-format-github-action@v4
+        with:
+          sources: "src/**/*.hpp,src/**/*.cpp,test/**/*.cpp"
+          style: file
+
+  test_linux:
+    name: Test on Linux
+    needs: prepare
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-python@v6
+        with:
+          python-version: "3.14"
+      - uses: actions/download-artifact@v7
+        if: inputs.ngsolve_version != ''
+        with:
+          name: release-pyproject
+      - name: Build and test
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgtest-dev libopenblas0-pthread
+          python -m pip install . numpy scipy matplotlib
+          cmake -S . -B build -DNGSTREFFTZ_USE_GTEST=ON -DCMAKE_BUILD_TYPE=Release
+          cmake --build build --parallel 2
+          ctest --test-dir build --output-on-failure
+
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    needs: [prepare, test_linux]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-15-intel, ubuntu-latest, windows-2022]
+    env:
+      CIBW_BUILD: ${{ inputs.level == 'quick' && 'cp314-*' || 'cp310-* cp311-* cp312-* cp313-* cp314-*' }}
+      CIBW_ARCHS_WINDOWS: AMD64
+      CIBW_ENVIRONMENT_WINDOWS: >
+        CMAKE_GENERATOR='Visual Studio 17 2022'
+        CMAKE_GENERATOR_PLATFORM=x64
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-tags: true
+          fetch-depth: 0
+      - uses: actions/download-artifact@v7
+        if: inputs.ngsolve_version != ''
+        with:
+          name: release-pyproject
+      - name: Free disk space for Linux wheel build
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          df -h
+          sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc
+          sudo apt-get clean
+          sudo rm -rf /var/lib/apt/lists/*
+          df -h
+      - uses: pypa/cibuildwheel@v3.2.1
+        env:
+          SETUPTOOLS_SCM_PRETEND_VERSION_FOR_NGSTREFFTZ: ${{ needs.prepare.outputs.version }}
+          CIBW_ENVIRONMENT_PASS_LINUX: SETUPTOOLS_SCM_PRETEND_VERSION_FOR_NGSTREFFTZ
+          CIBW_BUILD_VERBOSITY: 1
+      - uses: actions/upload-artifact@v7
+        with:
+          name: cibw-wheels-${{ matrix.os }}
+          path: ./wheelhouse/*.whl
+
+  build_sdist:
+    name: Build source distribution
+    if: ${{ inputs.level != 'quick' }}
+    needs: [prepare, test_linux]
+    runs-on: ubuntu-latest
+    container: quay.io/pypa/manylinux_2_28_x86_64
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-tags: true
+          fetch-depth: 0
+      - uses: actions/download-artifact@v7
+        if: inputs.ngsolve_version != ''
+        with:
+          name: release-pyproject
+      - name: Build sdist
+        env:
+          SETUPTOOLS_SCM_PRETEND_VERSION_FOR_NGSTREFFTZ: ${{ needs.prepare.outputs.version }}
+        run: uv tool run --python 3.14 --from build pyproject-build --sdist
+      - uses: actions/upload-artifact@v7
+        with:
+          name: cibw-sdist
+          path: dist/*.tar.gz
+
+  upload_pypi:
+    if: ${{ !inputs.dry_run && needs.prepare.outputs.published != 'true' }}
+    needs: [prepare, build_wheels, build_sdist]
+    runs-on: ubuntu-latest
+    environment: pypi
+    permissions:
+      id-token: write
+    steps:
+      - uses: actions/download-artifact@v7
+        with:
+          pattern: cibw-*
+          path: dist
+          merge-multiple: true
+      - uses: pypa/gh-action-pypi-publish@release/v1
+        if: github.ref == 'refs/heads/main' || github.event_name == 'release' || inputs.ngsolve_version != ''
+        with:
+          skip-existing: true
+          password: ${{ secrets.PYPI_API_TOKEN }}
+      - uses: pypa/gh-action-pypi-publish@release/v1
+        if: github.ref == 'refs/heads/main-dev' && inputs.ngsolve_version == ''
+        with:
+          skip-existing: true
+          password: ${{ secrets.PYPI_API_TOKEN }}
+          repository-url: https://test.pypi.org/legacy/
+
+  docker:
+    if: inputs.ngsolve_version == ''
+    needs: [upload_pypi]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - id: meta
+        uses: docker/metadata-action@v6
+        with:
+          # list of Docker images to use as base name for tags
+          images: paulstdocker/ngstrefftz
+          # generate Docker tags based on the following events/attributes
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+      - if: github.event_name == 'release' && github.event.action == 'published'
+        uses: docker/login-action@v4
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - uses: docker/build-push-action@v7
+        with:
+          context: .
+          file: Dockerfile
+          push: ${{ github.event_name == 'release' && github.event.action == 'published' }}
+          tags: ${{ steps.meta.outputs.tags }}
+
+  docs:
+    needs: [build_wheels]
+    runs-on: ubuntu-latest
+    container: python:3.14
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          path: "NGSTrefftz"
+      - uses: actions/download-artifact@v7
+        with:
+          name: cibw-wheels-ubuntu-latest
+          path: wheels
+      - name: Install wheel and documentation dependencies
+        run: |
+          apt update -y && DEBIAN_FRONTEND="noninteractive" apt install -y build-essential git pandoc
+          python -m pip install "$GITHUB_WORKSPACE"/wheels/*-cp314-cp314-*.whl -r "$GITHUB_WORKSPACE/NGSTrefftz/docs/requirements.txt"
+      - name: Build Sphinx HTML
+        run: sphinx-build -b html $GITHUB_WORKSPACE/NGSTrefftz/docs $GITHUB_WORKSPACE/NGSTrefftz/docs/_build/html
+      - uses: actions/upload-pages-artifact@v5
+        with:
+          path: ${{ github.workspace }}/NGSTrefftz/docs/_build/html
+
+  deploy-docs:
+    needs: docs
+    permissions:
+      pages: write # to deploy to Pages
+      id-token: write # to verify the deployment originates from an appropriate source
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/main' && !inputs.dry_run
+    steps:
+      - id: deployment
+        uses: actions/deploy-pages@v5
+
+  paper:
+    runs-on: ubuntu-latest
+    if: ${{ inputs.level != 'quick' }}
+    name: Paper Draft
+    steps:
+      - uses: actions/checkout@v6
+      - uses: openjournals/openjournals-draft-action@master
+        with:
+          journal: joss
+          paper-path: docs/paper/paper.md
+      - uses: actions/upload-artifact@v7
+        with:
+          name: joss_paper
+          path: docs/paper/paper.pdf

{ngstrefftz-0.3.2607.dev11 → ngstrefftz-0.3.2607.dev15}/CMakeLists.txt

@@ -36,10 +36,25 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_BINARY_DIR}/cmake_modules)
 
 set(addon_name ngstrefftz)
 project(ngstrefftz)
-include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/external_dependencies/ngstents/src) # SYSTEM to suppress warnings from headers
 include(${CMAKE_BINARY_DIR}/cmake_modules/ngsolve_addon.cmake)
+set(NGSTREFFTZ_USE_NGSTENTS AUTO CACHE STRING "Build with ngstents support")
+set_property(CACHE NGSTREFFTZ_USE_NGSTENTS PROPERTY STRINGS AUTO ON OFF)
+if(NOT NGSTREFFTZ_USE_NGSTENTS STREQUAL "OFF")
+  if(NOT ngstents_DIR)
+    execute_process(COMMAND ${Python3_EXECUTABLE} -m ngstents.config
+      OUTPUT_VARIABLE ngstents_DIR OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
+  endif()
+  find_package(ngstents CONFIG QUIET)
+  if(ngstents_FOUND)
+    set(NGSTREFFTZ_USE_NGSTENTS ON)
+  elseif(NGSTREFFTZ_USE_NGSTENTS STREQUAL "ON")
+    message(FATAL_ERROR "NGSTREFFTZ_USE_NGSTENTS=ON but ngstents was not found")
+  else()
+    set(NGSTREFFTZ_USE_NGSTENTS OFF)
+    message(WARNING "ngstents not found, building without tent-pitching support")
+  endif()
+endif()
 add_ngsolve_addon(ngstrefftz
-    ${CMAKE_SOURCE_DIR}/external_dependencies/ngstents/src/tents.cpp
     src/python_trefftz.cpp
     src/diffopmapped.hpp
     src/scalarmappedfe.cpp
@@ -47,11 +62,9 @@ add_ngsolve_addon(ngstrefftz
     src/trefftzfespace.cpp
     src/specialcoefficientfunction.cpp
     src/specialintegrator.cpp
-    src/twavetents.cpp
     src/embtrefftz.cpp
     src/lapack_loader.cpp
     src/monomialfespace.cpp
-    src/mesh1dtents.cpp
     src/condensedg.cpp
     src/pufe.cpp
     src/pufespace.cpp
@@ -60,7 +73,12 @@ add_ngsolve_addon(ngstrefftz
     #src/airy.cpp #for testing, requires boost
   )
 target_compile_definitions(ngstrefftz PRIVATE NGSTREFFTZ_EXPORTS)
-target_compile_definitions(ngstrefftz PRIVATE NGSTENT_EXPORTS)
+if(NGSTREFFTZ_USE_NGSTENTS)
+  target_sources(ngstrefftz PRIVATE src/twavetents.cpp src/mesh1dtents.cpp)
+  target_compile_definitions(ngstrefftz PRIVATE NGSTREFFTZ_USE_NGSTENTS)
+  target_link_libraries(ngstrefftz PRIVATE ngstents::core)
+  ngsolve_addon_set_relative_rpath(ngstrefftz "../ngstents")
+endif()
 # add dynamic loader library to link libraries (on linux)
 if(CMAKE_DL_LIBS)
     target_link_libraries(ngstrefftz PRIVATE ${CMAKE_DL_LIBS})
@@ -74,10 +92,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
         -Wpedantic
         -Wno-vla # ngsolve uses VLAs anyway
     )
-    set_source_files_properties( 
-        ${CMAKE_SOURCE_DIR}/external_dependencies/ngstents/src/tents.cpp 
-        PROPERTIES COMPILE_FLAGS "-w" #suppress all warnings
-    )
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     target_compile_options(ngstrefftz PRIVATE
         -Wall
@@ -86,10 +100,6 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
         -Wtype-limits
         -Wuninitialized
     )
-    set_source_files_properties( 
-        ${CMAKE_SOURCE_DIR}/external_dependencies/ngstents/src/tents.cpp 
-        PROPERTIES COMPILE_FLAGS "-w" #suppress all warnings
-    )
 endif()
 
 ### user options
@@ -127,6 +137,7 @@ message("${BoldCyan}
   Enabled functionality:
     Doxygen: ........... ${NGSTREFFTZ_BUILD_DOC}
     GTest: ............. ${NGSTREFFTZ_USE_GTEST}
+    ngstents: .......... ${NGSTREFFTZ_USE_NGSTENTS}
 
 With 'make install' the package will be installed to: ${CMAKE_INSTALL_PREFIX}
 Make sure to add it to the python path:
@@ -148,10 +159,14 @@ file(COPY
 add_test(NAME embtrefftz COMMAND python3 -m doctest ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Testing/embt.py)
 add_test(NAME conforming_trefftz COMMAND python3 -m doctest ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Testing/conforming_trefftz.py)
 add_test(NAME trefftz COMMAND python3 -m doctest ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Testing/trefftz.py)
-add_test(NAME tents COMMAND python3 -m doctest ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Testing/tents.py)
+set(tests_with_pythonpath embtrefftz trefftz)
+if(NGSTREFFTZ_USE_NGSTENTS)
+  add_test(NAME tents COMMAND python3 -m doctest ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Testing/tents.py)
+  list(APPEND tests_with_pythonpath tents)
+endif()
 add_test(NAME box COMMAND python3 -m doctest ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Testing/boxint.py)
 #WORKING_DIRECTORY ${ CMAKE_CURRENT_SOURCE_DIR }
-set_tests_properties(embtrefftz trefftz tents
+set_tests_properties(${tests_with_pythonpath}
     PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:${NGSOLVE_INSTALL_DIR}/${NGSOLVE_INSTALL_DIR_PYTHON}:$ENV{PYTHONPATH})
 
 if(NGSTREFFTZ_USE_GTEST)

{ngstrefftz-0.3.2607.dev11 → ngstrefftz-0.3.2607.dev15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ngstrefftz
-Version: 0.3.2607.dev11
+Version: 0.3.2607.dev15
 Summary: NGSTrefftz is an add-on to NGSolve for Trefftz methods.
 Author-Email: Paul Stocker <paul.stocker@univie.ac.at>
 Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
@@ -8,6 +8,7 @@ Project-URL: Documentation, https://paulst.github.io/NGSTrefftz
 Project-URL: Repository, https://github.com/PaulSt/ngstrefftz
 Requires-Python: >=3.10
 Requires-Dist: ngsolve==6.2.2607
+Requires-Dist: ngstents==0.1.2607rc1
 Description-Content-Type: text/markdown
 
 # NGSTrefftz

{ngstrefftz-0.3.2607.dev11 → ngstrefftz-0.3.2607.dev15}/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.3.2607.dev11'
-__version_tuple__ = version_tuple = (0, 3, 2607, 'dev11')
+__version__ = version = '0.3.2607.dev15'
+__version_tuple__ = version_tuple = (0, 3, 2607, 'dev15')
 
-__commit_id__ = commit_id = 'g1f041fc38'
+__commit_id__ = commit_id = 'g67e347b30'

{ngstrefftz-0.3.2607.dev11 → ngstrefftz-0.3.2607.dev15}/pyproject.toml

@@ -10,6 +10,7 @@ classifiers = [
 ]
 dependencies = [
   "ngsolve==6.2.2607",
+  "ngstents==0.1.2607rc1",
 ]
 
 [project.urls]
@@ -19,6 +20,7 @@ Repository = "https://github.com/PaulSt/ngstrefftz"
 [build-system]
 requires = [
   "ngsolve==6.2.2607",
+  "ngstents==0.1.2607rc1",
   "scikit-build-core>=0.9.0",
   "pybind11_stubgen",
   "setuptools>=45",
@@ -43,8 +45,8 @@ local_scheme = "no-local-version"
 [tool.cibuildwheel]
 #build-verbosity = 1
 manylinux-x86_64-image = "cerbsim/manylinux_2_28_x86_64_cuda_12.9"
+test-command = "python -c \"import ngstents; import ngstrefftz\""
 skip = """
-  pp*
   *_i686
   *musllinux*
   *win32

{ngstrefftz-0.3.2607.dev11 → ngstrefftz-0.3.2607.dev15}/src/__init__.py

@@ -1,4 +1,11 @@
 import ngsolve
+
+try:
+    import ngstents as _ngstents
+except ModuleNotFoundError as _error:
+    if _error.name != "ngstents":
+        raise
+
 from ngsolve.fem import ET,IntegrationRule
 from ngsolve.comp import L2,BilinearForm,LinearForm,SymbolicBFI,SymbolicLFI,FESpace
 from ngsolve.fem import CoordCF
@@ -25,7 +32,6 @@ def GetWave(self,U):
         f += SymbolicLFI(ipfct*v).SetIntegrationRule(eltyp,intrule)
         f.Assemble()
         U.vec.data = a.mat.Inverse(inverse='sparsecholesky') * f.vec
-        # return gfu
     else:
         fes = L2(initmesh, order=order-1)**(D+1)
         u,v = fes.TnT()
@@ -46,8 +52,9 @@ def GetWave(self,U):
 dbox = BoxDifferentialSymbol()
 dball = dbox(boxtype=BOXTYPE.BALL)
 
-setattr(TWaveTents1, 'GetWave', GetWave)
-setattr(TWaveTents2, 'GetWave', GetWave)
-setattr(TWaveTents3, 'GetWave', GetWave)
-setattr(QTWaveTents1, 'GetWave', GetWave)
-setattr(QTWaveTents2, 'GetWave', GetWave)
+if "TWaveTents1" in globals():
+    setattr(TWaveTents1, 'GetWave', GetWave)
+    setattr(TWaveTents2, 'GetWave', GetWave)
+    setattr(TWaveTents3, 'GetWave', GetWave)
+    setattr(QTWaveTents1, 'GetWave', GetWave)
+    setattr(QTWaveTents2, 'GetWave', GetWave)

{ngstrefftz-0.3.2607.dev11 → ngstrefftz-0.3.2607.dev15}/src/mesh1dtents.cpp

@@ -1,4 +1,4 @@
-#include <tents.hpp>
+#include <ngstents/tents.hpp>
 #include "mesh1dtents.hpp"
 
 namespace

{ngstrefftz-0.3.2607.dev11 → ngstrefftz-0.3.2607.dev15}/src/python_trefftz.cpp

@@ -3,13 +3,14 @@
 #include <fem.hpp>
 #include <comp.hpp>
 // using namespace ngsolve;
-#include <tents.hpp>
 #include "trefftzfespace.hpp"
 #include "specialcoefficientfunction.hpp"
 #include "specialintegrator.hpp"
+#ifdef NGSTREFFTZ_USE_NGSTENTS
 #include "twavetents.hpp"
-#include "embtrefftz.hpp"
 #include "mesh1dtents.hpp"
+#endif
+#include "embtrefftz.hpp"
 #include "monomialfespace.hpp"
 #include "pufespace.hpp"
 #include "condensedg.hpp"
@@ -26,9 +27,11 @@ PYBIND11_MODULE (ngstrefftz, m)
   ExportTrefftzFESpace (m);
   ExportSpecialCoefficientFunction (m);
   ExportSpecialIntegrator (m);
+#ifdef NGSTREFFTZ_USE_NGSTENTS
   ExportTWaveTents (m);
-  ExportEmbTrefftz (m);
   ExportMesh1dTents (m);
+#endif
+  ExportEmbTrefftz (m);
   ExportMonomialFESpace (m);
   ExportPUFESpace (m);
   ExportCondenseDG (m);

{ngstrefftz-0.3.2607.dev11 → ngstrefftz-0.3.2607.dev15}/src/twavetents.cpp

@@ -1,6 +1,6 @@
 #include "twavetents.hpp"
 #include <h1lofe.hpp>
-#include <paralleldepend.hpp>
+#include <ngstents/paralleldepend.hpp>
 #include <fem.hpp>
 #include "trefftzfespace.hpp"
 

{ngstrefftz-0.3.2607.dev11 → ngstrefftz-0.3.2607.dev15}/src/twavetents.hpp

@@ -1,6 +1,6 @@
 #ifndef FILE_TESTPYTHON_HPP
 #define FILE_TESTPYTHON_HPP
-#include <tents.hpp>
+#include <ngstents/tents.hpp>
 #include "scalarmappedfe.hpp"
 #include "trefftzfespace.hpp"
 #include <unordered_map>