ngstrefftz 0.3.2402.dev33__tar.gz → 0.3.2402.dev34__tar.gz

{ngstrefftz-0.3.2402.dev33 → ngstrefftz-0.3.2402.dev34}/.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.dev34}/.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.dev34}/.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.dev33 → ngstrefftz-0.3.2402.dev34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ngstrefftz
-Version: 0.3.2402.dev33
+Version: 0.3.2402.dev34
 Summary: NGSTrefftz is an add-on to NGSolve for Trefftz methods.
 Home-page: https://github.com/PaulSt/ngstrefftz
 Author: Paul Stocker

{ngstrefftz-0.3.2402.dev33 → ngstrefftz-0.3.2402.dev34}/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.dev34}/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.dev34}/src/ngstrefftz.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ngstrefftz
-Version: 0.3.2402.dev33
+Version: 0.3.2402.dev34
 Summary: NGSTrefftz is an add-on to NGSolve for Trefftz methods.
 Home-page: https://github.com/PaulSt/ngstrefftz
 Author: Paul Stocker