ngstrefftz 0.3.2402.dev33__tar.gz → 0.3.2402.dev35__tar.gz

{ngstrefftz-0.3.2402.dev33 → ngstrefftz-0.3.2402.dev35}/.github/workflows/build_linux_test.sh

@@ -13,7 +13,7 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/_internal/cpython-3.10.9/lib/
 echo "SHOW MKL"
 $PYDIR/pip show mkl
 
-cmake -DCMAKE_CXX_COMPILER=ngscxx -DNETGENDIR=$PYDIR/.. -DCMAKE_PREFIX_PATH=$PYDIR/..  -DPYTHON_EXECUTABLE=$PYDIR/python3 -DPYTHON_LIBRARY=$PYDIR/../lib -DPYTHON_INCLUDE_DIR=$PYDIR/../include -B ./NGSTrefftz/make -S ./NGSTrefftz/src/
+cmake -DCMAKE_CXX_COMPILER=ngscxx -DNETGENDIR=$PYDIR/.. -DCMAKE_PREFIX_PATH=$PYDIR/..  -DPYTHON_EXECUTABLE=$PYDIR/python3 -DPYTHON_LIBRARY=$PYDIR/../lib -DPYTHON_INCLUDE_DIR=$PYDIR/../include -DMKL_LIBRARY:PATH=$PYDIR/../lib/libmkl_rt.so.2 -B ./NGSTrefftz/make -S ./NGSTrefftz/src/
 make -C ./NGSTrefftz/make
 env CTEST_OUTPUT_ON_FAILURE=1 make -C ./NGSTrefftz/make test
 make -C ./NGSTrefftz/make install  

{ngstrefftz-0.3.2402.dev33 → ngstrefftz-0.3.2402.dev35}/.github/workflows/build_pip.ps1

@@ -27,15 +27,20 @@ if (test-path venv_ngs) {
 #Get-ChildItem venv_ngs\scripts
 #Write-Host $env:LIB
 
+Set-Location ../..
+Get-ChildItem
+python.exe -m venv .\venv_ngs
+.\venv_ngs\scripts\Activate.ps1
+$env:PATH += Join-Path ";" (Get-Item .).FullName "venv_ngs\bin"
+Write-Host $env:PATH
 
-pip3 install scikit-build wheel numpy twine mkl-devel==2022.* mkl==2022.* setuptools setuptools_scm
-pip3 install -r ngsolve_version.txt
-
+pip3 install scikit-build wheel numpy twine mkl-devel==2022.* mkl==2022.* setuptools==69.5.1 setuptools_scm==8.1.0
+pip3 install -r .github/workflows/ngsolve_version.txt
 
 #$env:PYDIR = "$env:Python3_ROOT_DIR"
 #$env:PATH += ";$env:pythonLibrary;$env:Python3_ROOT_DIR"
-$env:NGSolve_DIR = "$env:Python3_ROOT_DIR\lib\site-packages\ngsolve\cmake"
-$env:Netgen_DIR = "$env:Python3_ROOT_DIR\lib\site-packages\netgen\cmake"
+#$env:NGSolve_DIR = "$env:Python3_ROOT_DIR\lib\site-packages\ngsolve\cmake"
+#$env:Netgen_DIR = "$env:Python3_ROOT_DIR\lib\site-packages\netgen\cmake"
 #$env:LIB = "$env:LIB;$env:Python3_ROOT_DIR\libs"
 #$env:LIBPATH = "$env:LIBPATH;$env:Python3_ROOT_DIR\libs"
 
@@ -49,6 +54,5 @@ $env:Netgen_DIR = "$env:Python3_ROOT_DIR\lib\site-packages\netgen\cmake"
 #Get-ChildItem $env:Python3_ROOT_DIR\lib\site-packages
 #Get-ChildItem $env:Python3_ROOT_DIR\lib\site-packages\ngsolve
 
-Set-Location ../..
-Get-ChildItem
+
 python setup.py bdist_wheel -G"Visual Studio 16 2019" -d wheelhouse

{ngstrefftz-0.3.2402.dev33 → ngstrefftz-0.3.2402.dev35}/.github/workflows/build_pip.sh

@@ -25,7 +25,7 @@ do
 
     #rm -rf /home/app/ngstrefftz/make
     rm -rf _skbuild
-    $PYDIR/pip install pytest-check numpy wheel scikit-build mkl==2023.* mkl-devel==2023.* setuptools setuptools_scm
+    $PYDIR/pip install pytest-check numpy wheel scikit-build mkl==2023.* mkl-devel==2023.* setuptools==69.5.1 setuptools_scm==8.1.0
     $PYDIR/pip install -r ./.github/workflows/ngsolve_version.txt
 
     $PYDIR/pip wheel -vvv .

{ngstrefftz-0.3.2402.dev33 → ngstrefftz-0.3.2402.dev35}/.github/workflows/build_pip_mac.sh

@@ -6,9 +6,9 @@ rm -rf _skbuild dist venv_ngs
 export PYDIR=$Python3_ROOT_DIR/bin
 #export PYDIR=/Library/Frameworks/Python.framework/Versions/$1/bin
 
-$PYDIR/python3 --version
+#$PYDIR/python3 --version
 #$PYDIR/python3 -m venv venv_ngs
-#source venv_ngs/bin/activate
+#. venv_ngs/bin/activate
 
 export PATH=/Applications/CMake.app/Contents/bin:$PATH
 export NETGEN_Dir=$PYDIR/../lib/python$1/site-packages/netgen/cmake
@@ -17,12 +17,17 @@ export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$NGSolve_Dir:$NETGEN_Dir
 #export PYDIR=/Library/Frameworks/Python.framework/Versions/$1/bin
 #$PYDIR/python3 -m venv ../venv_ngs
 #source ../venv_ngs/bin/activate
-$PYDIR/pip3 install scikit-build wheel setuptools setuptools_scm
+$PYDIR/pip3 install scikit-build wheel setuptools==69.5.1 setuptools_scm==8.1.0
 #$PYDIR/pip3 install -U pytest-check numpy wheel scikit-build mkl==2022.* mkl-devel==2022.* setuptools
 
 export CMAKE_OSX_ARCHITECTURES='arm64;x86_64'
 #export CMAKE_OSX_ARCHITECTURES='x86_64'
 $PYDIR/pip3 install -r ./.github/workflows/ngsolve_version.txt
+#export NETGEN_Dir=$PWD/venv_ngs/lib/make/netgen/
+#export NGSolve_Dir=$PWD/venv_ngs/lib/cmake/ngsolve/
+#export NETGEN_Dir=$PWD/venv_ngs/lib/python$1/site-packages/netgen/cmake
+#export NGSolve_Dir=$PWD/venv_ngs/lib/python$1/site-packages/ngsolve/cmake
+#export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$NGSolve_Dir:$NETGEN_Dir
 
 #$PYDIR/pip3 wheel .
 $PYDIR/python3 setup.py bdist_wheel --plat-name macosx-10.15-universal2 -d wheelhouse

ngstrefftz-0.3.2402.dev35/.github/workflows/ngsolve_version.txt

@@ -0,0 +1 @@
+ngsolve>=6.2.2402

{ngstrefftz-0.3.2402.dev33 → ngstrefftz-0.3.2402.dev35}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: ngstrefftz
-Version: 0.3.2402.dev33
+Version: 0.3.2402.dev35
 Summary: NGSTrefftz is an add-on to NGSolve for Trefftz methods.
 Home-page: https://github.com/PaulSt/ngstrefftz
 Author: Paul Stocker
 Author-email: p.stocker@math.uni-goettingen.de
 License: LGPL2.1
 License-File: LICENSE
-Requires-Dist: ngsolve>=6.2.2401.post24.dev0
+Requires-Dist: ngsolve>=6.2.2402
 Requires-Dist: ngstents>=0.0.2.dev39
 Requires-Dist: mkl
 

{ngstrefftz-0.3.2402.dev33 → ngstrefftz-0.3.2402.dev35}/external_dependencies/ngstents/.github/workflows/build.yml

@@ -24,11 +24,11 @@ jobs:
              pip3 install pytest matplotlib numpy
       - name: set path
         run: |
-             echo "PYTHONPATH=/usr/lib/python3/dist-packages/:$GITHUB_WORKSPACE/install" >> $GITHUB_ENV
+             echo "PYTHONPATH=/usr/lib/python3/dist-packages/:$GITHUB_WORKSPACE/install/lib/python3.10/dist-packages" >> $GITHUB_ENV
              echo "NETGENDIR=/usr/bin/" >> $GITHUB_ENV
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: cmake ngstents
-        run: cmake -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/install -B$GITHUB_WORKSPACE/make -S$GITHUB_WORKSPACE/src
+        run: cmake -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/install -DPY_INSTALL_DIR="" -B$GITHUB_WORKSPACE/make -S$GITHUB_WORKSPACE/src
       - name: compile ngstents
         run: |
              make -C$GITHUB_WORKSPACE/make
@@ -39,27 +39,32 @@ jobs:
              pytest .
 
   macos-nightly:
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:     
-      - name: install ngsolve
-        run: |
-             wget https://www.asc.tuwien.ac.at/~mhochsteger/ngsolve/macos/NGSolve_nightly.dmg
-             hdiutil attach NGSolve_nightly.dmg
-             cp -R /Volumes/NGSolve/* /Applications
+      - name: Get Python 
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.12'
       - name: set path
         run: |
-             echo "PYTHONPATH=$PYTHONPATH:/Applications/Netgen.app/Contents/Resources/lib/python3.8/site-packages:." >> $GITHUB_ENV
-             echo "NETGENDIR=/Applications/Netgen.app/Contents/MacOS" >> $GITHUB_ENV
-             echo "DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$NETGENDIR" >> $GITHUB_ENV
-             echo "DYLD_FRAMEWORK_PATH=$DYLD_FRAMEWORK_PATH:$NETGENDIR/../Frameworks" >> $GITHUB_ENV
-             echo "$NETGENDIR" >> $GITHUB_PATH
-      - uses: actions/checkout@v3
+             echo "PYDIR=${{ env.Python3_ROOT_DIR }}/bin" >> $GITHUB_ENV
+             echo "NETGEN_Dir=${{ env.Python3_ROOT_DIR }}/bin/../lib/python3.12/site-packages/netgen/cmake" >> $GITHUB_ENV
+             echo "NGSolve_Dir=${{ env.Python3_ROOT_DIR }}/bin/../lib/python3.12/site-packages/ngsolve/cmake" >> $GITHUB_ENV
+             echo "/Applications/CMake.app/Contents/bin" >> $GITHUB_PATH
+      - run: echo "CMAKE_PREFIX_PATH=${{ env.CMAKE_PREFIX_PATH }}:${{ env.NGSolve_Dir }}:${{ env.NETGEN_Dir }}" >> $GITHUB_ENV
+      - name: install ngsolve
+        run: pip3 install ngsolve pytest matplotlib
+      - uses: actions/checkout@v4
       - name: cmake ngstents
         run: cmake -B$GITHUB_WORKSPACE/make -S$GITHUB_WORKSPACE/src
       - name: compile ngstents
         run: |
              make -C$GITHUB_WORKSPACE/make
              sudo make -C$GITHUB_WORKSPACE/make install  
+      - name: test ngstents
+        run: |
+             cd $GITHUB_WORKSPACE/tests
+             pytest .
 
   pypi-linux:
     name: Build wheels for linux
@@ -68,7 +73,7 @@ jobs:
     steps:
       - name: clear cache
         run: rm -rf /opt/hostedtoolcache
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'True'
           path: 'ngstents'
@@ -78,9 +83,9 @@ jobs:
       - name: build pip
         run: docker run -v $GITHUB_WORKSPACE:/workspace sameli/manylinux2014_x86_64_cuda_11.7 /bin/sh /workspace/ngstents/.github/workflows/build_pip.sh 
       - name: Store the binary wheel
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: python-package-distributions
+          name: python-package-distributions-linux
           path: ngstents/wheelhouse
 
   pypi-mac:
@@ -88,13 +93,13 @@ jobs:
     needs: [ubuntu-nightly, macos-nightly]
     strategy:
       matrix:
-        py: ['3.8', '3.9', '3.10', '3.11']
+        py: ['3.8', '3.9', '3.10', '3.11', '3.12']
     runs-on: macos-11
     env:
       MACOSX_DEPLOYMENT_TARGET: '10.15'
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: recursive
@@ -106,9 +111,9 @@ jobs:
       - name: Run build script
         run: cd ngstents/.github/workflows && bash build_pip_mac.sh ${{ matrix.py }}
       - name: Store the binary wheel
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: python-package-distributions
+          name: python-package-distributions-mac-${{ matrix.py }}
           path: ngstents/wheelhouse
 
   pypi-win:
@@ -116,11 +121,11 @@ jobs:
     needs: [ubuntu-nightly, macos-nightly]
     strategy:
       matrix:
-        py: ['3.8', '3.9', '3.10', '3.11']
+        py: ['3.8', '3.9', '3.10', '3.11', '3.12']
     runs-on: windows-2019
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: recursive
@@ -133,9 +138,9 @@ jobs:
       - name: Run build script
         run: Set-Location ngstents/.github/workflows; ./build_pip.ps1 ${{ env.pythonLocation }}
       - name: Store the binary wheel
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: python-package-distributions
+          name: python-package-distributions-win-${{ matrix.py }}
           path: ngstents/wheelhouse
 
   publish-pypi:
@@ -144,9 +149,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Download all the dists
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v4
       with:
-        name: python-package-distributions
+        pattern: python-package-distributions-*
+        merge-multiple: true
         path: ngstents/wheelhouse/
     - name: Publish binary distributions to PyPI
       if: github.ref == 'refs/heads/master'
@@ -161,7 +167,7 @@ jobs:
     needs: [publish-pypi]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
           submodules: 'True'

ngstrefftz-0.3.2402.dev35/external_dependencies/ngstents/.github/workflows/build_pip.ps1

@@ -0,0 +1,24 @@
+$ErrorActionPreference = "Stop"
+
+if (test-path _skbuild) {
+    cmd.exe /c rd /s /q _skbuild
+}
+if (test-path dist) {
+    cmd.exe /c rd /s /q dist
+}
+if (test-path venv_ngs) {
+    cmd.exe /c rd /s /q venv_ngs
+}
+
+Set-Location ../..
+python.exe -m venv .\venv_ngs
+.\venv_ngs\scripts\Activate.ps1
+$env:PATH += Join-Path ";" (Get-Item .).FullName "venv_ngs\bin"
+
+pip3 install scikit-build wheel numpy twine mkl-devel==2022.* mkl==2022.* setuptools==69.5.1 setuptools_scm==8.1.0
+pip3 install -r .github/workflows/ngsolve_version.txt
+
+#$env:NGSolve_DIR = "$env:Python3_ROOT_DIR\lib\site-packages\ngsolve\cmake"
+#$env:Netgen_DIR = "$env:Python3_ROOT_DIR\lib\site-packages\netgen\cmake"
+
+python setup.py bdist_wheel -G"Visual Studio 16 2019" -d wheelhouse

{ngstrefftz-0.3.2402.dev33 → ngstrefftz-0.3.2402.dev35}/external_dependencies/ngstents/.github/workflows/build_pip.sh

@@ -15,18 +15,18 @@ git config --global --add safe.directory '*'
 
 export ORIGINAL_PATH="$PATH"
 
-for pyversion in 38 39 310 311
+for pyversion in 38 39 310 311 312
 do
     export PYDIR="/opt/python/cp${pyversion}-cp${pyversion}/bin"
     export PATH="$ORIGINAL_PATH:$PYDIR"
 
     rm -rf _skbuild
-    $PYDIR/pip install pytest-check numpy wheel scikit-build mkl==2023.* mkl-devel==2023.* setuptools
-    $PYDIR/pip install ngsolve 
+    $PYDIR/pip install pytest-check numpy wheel scikit-build mkl==2023.* mkl-devel==2023.* setuptools==69.5.1 setuptools_scm==8.1.0
+    $PYDIR/pip install -r ./.github/workflows/ngsolve_version.txt
 
     $PYDIR/pip wheel -vvv .
     rename linux_ manylinux_2_17_x86_64.manylinux2014_ ngstents*.whl
     mv ngstents*.whl wheelhouse/
     rm -rf *.whl
-    $PYDIR/pip uninstall -y ngsolve netgen-mesher setuptools pytest-check numpy wheel scikit-build mkl mkl-devel 
+    $PYDIR/pip uninstall -y ngsolve netgen-mesher setuptools setuptools_scm pytest-check numpy wheel scikit-build mkl mkl-devel 
 done

{ngstrefftz-0.3.2402.dev33 → ngstrefftz-0.3.2402.dev35}/external_dependencies/ngstents/.github/workflows/build_pip_mac.sh

@@ -11,9 +11,9 @@ export PATH=/Applications/CMake.app/Contents/bin:$PATH
 export NETGEN_Dir=$PYDIR/../lib/python$1/site-packages/netgen/cmake
 export NGSolve_Dir=$PYDIR/../lib/python$1/site-packages/ngsolve/cmake
 export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$NGSolve_Dir:$NETGEN_Dir
-$PYDIR/pip3 install scikit-build wheel
+$PYDIR/pip3 install scikit-build wheel setuptools==69.5.1 setuptools_scm==8.1.0
 
 export CMAKE_OSX_ARCHITECTURES='arm64;x86_64'
-$PYDIR/pip3 install ngsolve
+$PYDIR/pip3 install -r ./.github/workflows/ngsolve_version.txt
 
 $PYDIR/python3 setup.py bdist_wheel --plat-name macosx-10.15-universal2 -d wheelhouse

ngstrefftz-0.3.2402.dev35/external_dependencies/ngstents/.github/workflows/ngsolve_version.txt

@@ -0,0 +1 @@
+ngsolve>=6.2.2402

{ngstrefftz-0.3.2402.dev33 → ngstrefftz-0.3.2402.dev35}/external_dependencies/ngstents/README.md

@@ -16,6 +16,8 @@ python >= 3.9).
 
 * `pip install ngstents`
 
+But note that the binaries are not generally kept up to date. The
+recommended option is to build from source (see below).
 
 ## Build
 

ngstrefftz-0.3.2402.dev35/external_dependencies/ngstents/setup.py

@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+from skbuild import setup
+from setuptools_scm import get_version
+import sys
+
+_cmake_args = []
+version = get_version().split('+')[0]
+
+ngsolve_version = '6.2.2402'
+install_requires = [ 'ngsolve >= '+ngsolve_version, 'matplotlib' ] 
+
+setup(
+    name='ngstents',
+    version=version,
+    author='Jay Gopalakrishnan',
+    author_email='gjay@pdx.edu',
+    description='Spacetime tent facilities for solving hyperbolic equations',
+    long_description='This ngstents package is a c++ extension of the NGSolve finite element library, designed to ease experimentation with solvers based on spacetime tents for hyperbolic systems. A python front-end allows new equations (linear or nonlinear conservation laws) to be solved by easily defining required fluxes and numerical fluxes in a few lines of code.',
+    url="https://github.com/jayggg/ngstents",
+    license="LGPL2.1",
+    install_requires=install_requires,
+    packages=["ngstents"],
+    package_dir={"ngstents": "src"},
+    cmake_args=_cmake_args,
+    cmake_source_dir='src',
+)

ngstrefftz-0.3.2402.dev35/external_dependencies/ngstents/src/CMakeLists.txt

@@ -0,0 +1,97 @@
+cmake_minimum_required(VERSION 3.1)
+project(ngstents)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# Find NGSolve and Netgen using python
+if(CMAKE_VERSION VERSION_LESS "3.18")
+  find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
+else()
+  find_package(Python3 REQUIRED COMPONENTS Interpreter Development.Module)
+endif()
+set(Netgen_DIR "" CACHE PATH "Path to directory containing NetgenConfig.cmake")
+set(NGSolve_DIR "" CACHE PATH "Path to directory containing NGSolveConfig.cmake")
+execute_process(COMMAND ${Python3_EXECUTABLE} -m netgen.config OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE Netgen_DIR)
+execute_process(COMMAND ${Python3_EXECUTABLE} -m ngsolve.config OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE NGSolve_DIR)
+find_package(NGSolve CONFIG REQUIRED)
+
+### check if CMAKE_INSTALL_PREFIX is set by user, if not install in NGSolve python dir
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    execute_process(COMMAND ${Python3_EXECUTABLE} -m site --user-site OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE install_dir RESULT_VARIABLE ret)
+    if (NOT ret EQUAL 0)
+        # user site directory is disabled (are we in a virtual environment?)
+        set(install_dir ${Python3_SITEARCH})
+    endif()
+    message("The python module ${module_name} will be installed to: ${install_dir}")
+    set(CMAKE_INSTALL_PREFIX ${install_dir} CACHE PATH "Install dir" FORCE)
+else(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    #set(PY_INSTALL_DIR ${NGSOLVE_INSTALL_DIR_PYTHON} CACHE STRING "subdir of install dir for python modules")
+    execute_process(COMMAND ${Python3_EXECUTABLE} -c "import os.path, sysconfig;print(os.path.relpath(sysconfig.get_path('platlib'), sysconfig.get_path('data')))" OUTPUT_VARIABLE PY_INSTALL_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR} CACHE PATH "build dir")
+
+add_library(_pytents SHARED
+  python_tents.cpp
+  tents.cpp
+  )
+add_library(_pyconslaw SHARED
+  python_conslaw.cpp
+  burgers.cpp
+  euler.cpp
+  wave.cpp
+  advection.cpp
+  maxwell.cpp
+  symbolic.cpp
+  vis3d.cpp
+  )
+target_link_libraries(_pytents PUBLIC ngsolve Python3::Module)
+set_target_properties(_pytents PROPERTIES PREFIX "" CXX_STANDARD 17)
+target_compile_definitions(_pytents PRIVATE NGSTENT_EXPORTS)
+target_link_libraries(_pyconslaw PRIVATE _pytents)
+set_target_properties(_pyconslaw PROPERTIES PREFIX "" CXX_STANDARD 17)
+if(WIN32)
+  set_target_properties(_pytents PROPERTIES SUFFIX ".pyd" )
+  set_target_properties(_pyconslaw PROPERTIES SUFFIX ".pyd" )
+else(WIN32)
+  set_target_properties(_pytents PROPERTIES SUFFIX ".so")
+  set_target_properties(_pyconslaw PROPERTIES SUFFIX ".so")
+endif(WIN32)
+set_target_properties(_pytents PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ngstents")
+set_target_properties(_pyconslaw PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ngstents")
+
+option(BUILD_STUB_FILES "Generate stub files for better autocompletion support" OFF)
+if(BUILD_STUB_FILES)
+  execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import pybind11_stubgen; print(pybind11_stubgen.__file__)" OUTPUT_VARIABLE stubgen_path RESULT_VARIABLE pybind11_stubgen)
+  if(pybind11_stubgen AND NOT ${pybind11_stubgen} EQUAL 0)    
+    message(WARNING "pybind11-stubgeN not found, if you want to create stub files
+for better autocompletion support install it with pip.")
+  else()
+    message("-- Found pybind11-stubgen: ${stubgen_path}")
+    set(FOUND_STUBGEN ON)
+  endif()
+   message(STATUS
+      "This project is only compatible with\n\t\tpybind11-stubgen==0.5")
+endif(BUILD_STUB_FILES)
+
+message("With 'make install' the python package will be installed to: ${CMAKE_INSTALL_PREFIX}/${PY_INSTALL_DIR}")
+install(TARGETS _pytents DESTINATION ${CMAKE_INSTALL_PREFIX}/${PY_INSTALL_DIR}/ngstents)
+install(TARGETS _pyconslaw DESTINATION ${CMAKE_INSTALL_PREFIX}/${PY_INSTALL_DIR}/ngstents/conslaw)
+
+install(FILES
+  ../py/__init__.py
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/${PY_INSTALL_DIR}/ngstents)
+
+install(FILES
+  ../py/utils/__init__.py
+  ../py/utils/_drawtents.py
+  ../py/utils/_drawtents2d.py
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/${PY_INSTALL_DIR}/ngstents/utils)
+
+install(FILES
+  ../py/conslaw/__init__.py
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/${PY_INSTALL_DIR}/ngstents/conslaw)
+
+if(FOUND_STUBGEN)
+  install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pybind11_stubgen --no-setup-py  ngstents)")
+  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/stubs/ngstents-stubs/ DESTINATION ${CMAKE_INSTALL_PREFIX}/${PY_INSTALL_DIR}/ngstents)
+endif(FOUND_STUBGEN)

{ngstrefftz-0.3.2402.dev33 → ngstrefftz-0.3.2402.dev35}/external_dependencies/ngstents/src/tents.cpp

@@ -565,7 +565,7 @@ std::tuple<Table<int>,Table<int>> TentSlabPitcher::InitializeMeshData(LocalHeap
 // Get the periodic vertex associated with a primary vertex in periodic case
 void TentSlabPitcher::GetVertexElements(int vnr_main, Array<int> & elems) const
 {
-  ma->GetVertexElements (vnr_main, elems);
+  elems = ma->GetVertexElements(vnr_main); 
   if(per_verts[vnr_main].Size()==0)
     return;
   else

{ngstrefftz-0.3.2402.dev33 → ngstrefftz-0.3.2402.dev35}/external_dependencies/ngstents/src/tents.hpp

@@ -34,6 +34,7 @@ using namespace std;
 /// vertices.
 ///
 
+
 class NGSTENT_API Tent {
 
 public:

{ngstrefftz-0.3.2402.dev33 → ngstrefftz-0.3.2402.dev35}/setup.py

@@ -21,18 +21,13 @@ import os, sys
 root_dir = sys.prefix
 print(f'root_dir: {root_dir}')
 if 'darwin' in sys.platform:
-    _cmake_args += [
-        '-DBUILD_STUB_FILES=ON',
-    ]
+    _cmake_args += [ ]
 elif 'linux' in sys.platform:
     _cmake_args += [
         '-DUSE_MKL:BOOL=ON',
         f'-DMKL_ROOT:PATH={root_dir}',
         f'-DMKL_LIBRARY:PATH={root_dir}/lib/libmkl_rt.so.2',
         f'-DMKL_INCLUDE_DIR:PATH={root_dir}/include',
-        '-DUSE_CUDA=ON',
-        '-DCMAKE_CUDA_ARCHITECTURES=all',
-        '-DBUILD_STUB_FILES=ON',
     ]
     install_requires.append('mkl')
     packages = []
@@ -43,7 +38,6 @@ elif 'win' in sys.platform:
         f'-DMKL_LIBRARY:PATH={root_dir}/Library/lib/mkl_rt.lib',
         f'-DMKL_INCLUDE_DIR:PATH={root_dir}/Library/include',
         f'-DNGSOLVE_INSTALL_DIR_TCL:PATH=Scripts',
-        '-DBUILD_STUB_FILES=OFF',
     ]
     install_requires.append('mkl')
 

{ngstrefftz-0.3.2402.dev33 → ngstrefftz-0.3.2402.dev35}/src/CMakeLists.txt

@@ -32,16 +32,20 @@ execute_process(COMMAND ${Python3_EXECUTABLE} -m ngsolve.config OUTPUT_STRIP_TRA
 find_package(NGSolve CONFIG REQUIRED)
 
 ### check if CMAKE_INSTALL_PREFIX is set by user, if not install in NGSolve python dir
+
+#set(INSTDIR_FROM_NGSOLVE ${CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT} CACHE BOOL "Try to get install dir from NGSolve")
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     execute_process(COMMAND ${Python3_EXECUTABLE} -m site --user-site OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE install_dir RESULT_VARIABLE ret)
     if (NOT ret EQUAL 0)
         # user site directory is disabled (are we in a virtual environment?)
         set(install_dir ${Python3_SITEARCH})
     endif()
-    message("The python module ${module_name} will be installed to: ${install_dir}")
+    message("Install dir from NGSolve: ${install_dir}")
     set(CMAKE_INSTALL_PREFIX ${install_dir} CACHE PATH "Install dir" FORCE)
 else(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-    set(PY_INSTALL_DIR ${NGSOLVE_INSTALL_DIR_PYTHON} CACHE STRING "subdir of install dir for python modules")
+    #set(PY_INSTALL_DIR ${NGSOLVE_INSTALL_DIR_PYTHON} CACHE STRING "subdir of install dir for python modules")
+    execute_process(COMMAND ${Python3_EXECUTABLE} -c "import os.path, sysconfig;print(os.path.relpath(sysconfig.get_path('platlib'), sysconfig.get_path('data')))" OUTPUT_VARIABLE PY_INSTALL_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+    message("python packages install dir: ${PY_INSTALL_DIR}")
 endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR} CACHE PATH "build dir")
 
@@ -128,6 +132,7 @@ if (NGSTREFFTZ_USE_MKL)
     set(MKL_STATIC OFF CACHE BOOL "Link static MKL")
     set(MKL_SDL ON CACHE BOOL "Link single dynamic MKL lib")
     set(MKL_ARCH "intel64")
+    message("MKL_ARCH=${MKL_ARCH}")
     if(NOT MKL_LINK)
       if(MKL_STATIC)
         set(MKL_LINK static)
@@ -138,38 +143,53 @@ if (NGSTREFFTZ_USE_MKL)
       endif()
     endif()
     find_package(MKL) # HINTS ${MKL_ROOT} ${CMAKE_INSTALL_PREFIX}/../../cmake/mkl ${Python3_ROOT_DIR}/lib/cmake/mkl)
-    if(APPLE OR WIN32)
-      set(MKL_RT_NAME mkl_rt.2)
-    else()
-      set(MKL_RT_NAME libmkl_rt.so.2)
-    endif()
-    find_library(MKLRT ${MKL_RT_NAME} HINTS ${MKL_ROOT}/lib)
-    message("MKL minimal: ${MKL_MINIMAL_LIBRARIES}")
-    message("MKLRT: ${MKLRT}")
+    #message("MKL minimal: ${MKL_MINIMAL_LIBRARIES}")
+    #message("MKL libraries: ${MKL_LIBRARIES}")
+    #message("MKL link flags: ${MKL_LINK_FLAGS}")
 
-    #if(NOT MKL_FOUND OR NOT MKLRT)
-    if(NOT MKL_MINIMAL_LIBRARIES)
-        message("${Red}MKL not found, switching off NGSTREFFTZ_USE_LAPACK!${ColourReset}")
-        set(NGSTREFFTZ_USE_LAPACK OFF)
-    else()
-        if(WIN32)
-            set(LAPACK_LIBRARIES "${MKL_MINIMAL_LIBRARIES}")
-        else()
-            set(LAPACK_LIBRARIES "${MKLRT}")
-        endif()
+    #if(MKL_FOUND)
+    if(MKL_MINIMAL_LIBRARIES)
+        set(LAPACK_LIBRARIES "${MKL_LIBRARIES}")
         message("Setting LAPACK_LIBRARIES=${LAPACK_LIBRARIES}")
         target_include_directories(_trefftz PRIVATE "${MKL_INCLUDE_DIRS}")
     endif()
+    if(MKL_LIBRARY)
+        message("MKL_LIBRARY=${MKL_LIBRARY}")
+        #if(WIN32)
+            #set(LAPACK_LIBRARIES "${MKL_MINIMAL_LIBRARIES}")
+        #else()
+            #set(LAPACK_LIBRARIES "${MKL_LIBRARIES}")
+        #endif()
+    #if(NOT MKL_LIBRARIES)
+        #if(APPLE OR WIN32)
+          #set(MKL_RT_NAME mkl_rt.2)
+        #else()
+          #set(MKL_RT_NAME libmkl_rt.so.2)
+        #endif()
+        get_filename_component(MKL_RT_NAME ${MKL_LIBRARY} NAME)
+        message("MKL_RT_NAME=${MKL_RT_NAME}")
+        find_library(MKLRT ${MKL_RT_NAME} HINTS ${MKL_ROOT}/lib ${MKL_LIBRARY})
+        message("MKLRT=${MKLRT}")
+        if(MKLRT)
+            set(LAPACK_LIBRARIES ${MKLRT})
+            message("MKLRT setting LAPACK_LIBRARIES=${LAPACK_LIBRARIES}")
+        endif()
+    #else()
+        #message("${Red}MKL not found, switching off NGSTREFFTZ_USE_LAPACK!${ColourReset}")
+        #set(NGSTREFFTZ_USE_LAPACK OFF)
+    endif()
 endif (NGSTREFFTZ_USE_MKL)
 if(NGSTREFFTZ_USE_LAPACK AND NOT LAPACK_LIBRARIES)
     find_package(LAPACK)
-endif(NGSTREFFTZ_USE_LAPACK)
+endif(NGSTREFFTZ_USE_LAPACK AND NOT LAPACK_LIBRARIES)
 if(LAPACK_LIBRARIES)
     #target_link_libraries(_trefftz PRIVATE $<BUILD_INTERFACE:ngs_lapack>)
     message("Linking with LAPACK_LIBRARIES=${LAPACK_LIBRARIES}")
     target_link_libraries(_trefftz PRIVATE ${LAPACK_LIBRARIES})
     target_compile_definitions(_trefftz PRIVATE NGSTREFFTZ_USE_LAPACK)
-endif()
+else(LAPACK_LIBRARIES)
+    message("${Red}LAPACK not found, restricted usage${ColourReset}")
+endif(LAPACK_LIBRARIES)
 
 ### install
 set_target_properties(_trefftz PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ngstrefftz")

{ngstrefftz-0.3.2402.dev33 → ngstrefftz-0.3.2402.dev35}/src/ngstrefftz.egg-info/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: ngstrefftz
-Version: 0.3.2402.dev33
+Version: 0.3.2402.dev35
 Summary: NGSTrefftz is an add-on to NGSolve for Trefftz methods.
 Home-page: https://github.com/PaulSt/ngstrefftz
 Author: Paul Stocker
 Author-email: p.stocker@math.uni-goettingen.de
 License: LGPL2.1
 License-File: LICENSE
-Requires-Dist: ngsolve>=6.2.2401.post24.dev0
+Requires-Dist: ngsolve>=6.2.2402
 Requires-Dist: ngstents>=0.0.2.dev39
 Requires-Dist: mkl
 

{ngstrefftz-0.3.2402.dev33 → ngstrefftz-0.3.2402.dev35}/src/ngstrefftz.egg-info/SOURCES.txt

@@ -48,6 +48,7 @@ external_dependencies/ngstents/.github/workflows/build_pip.ps1
 external_dependencies/ngstents/.github/workflows/build_pip.sh
 external_dependencies/ngstents/.github/workflows/build_pip_mac.sh
 external_dependencies/ngstents/.github/workflows/fix_auditwheel_policy.py
+external_dependencies/ngstents/.github/workflows/ngsolve_version.txt
 external_dependencies/ngstents/demo/advection/Advection_Periodic_Clipping.ipynb
 external_dependencies/ngstents/demo/advection/advection2d.py
 external_dependencies/ngstents/demo/advection/advection2d_periodic.py

ngstrefftz-0.3.2402.dev35/src/ngstrefftz.egg-info/requires.txt

@@ -0,0 +1,3 @@
+ngsolve>=6.2.2402
+ngstents>=0.0.2.dev39
+mkl

ngstrefftz-0.3.2402.dev33/.github/workflows/ngsolve_version.txt

@@ -1 +0,0 @@
-ngsolve>=6.2.2401.post24.dev0