xfem 2.1.2406.dev3__tar.gz → 2.1.2406.dev18__tar.gz

{xfem-2.1.2406.dev3 → xfem-2.1.2406.dev18}/.gitlab-ci.yml

@@ -277,11 +277,11 @@ pip_linux:
 
   stage: deploy
   script:
-    - ./.ci/build_pip.sh 38
     - ./.ci/build_pip.sh 39
     - ./.ci/build_pip.sh 310
     - ./.ci/build_pip.sh 311
     - ./.ci/build_pip.sh 312
+    - ./.ci/build_pip.sh 313
     - export PIP_BREAK_SYSTEM_PACKAGES=1
     - /opt/python/cp39-cp39/bin/pip install twine
     - /opt/python/cp39-cp39/bin/python -m twine upload --skip-existing wheelhouse/* -u __token__ -p $PYPI_UPLOAD_TOKEN

{xfem-2.1.2406.dev3 → xfem-2.1.2406.dev18}/CMakeLists.txt

@@ -8,12 +8,20 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 
 # Download ngsolve_addon.cmake from template project
-set(ngsolve_addon_version bbfb9648f2ff7a952a3a8edca58f460c198ca462)
-set(ngsolve_addon_md5 d1b208d6aa63edce64a264e5e0370d3a)
-file(DOWNLOAD https://raw.githubusercontent.com/NGSolve/ngsolve-addon-template/${ngsolve_addon_version}/ngsolve_addon.cmake
+# set(ngsolve_addon_version bbfb9648f2ff7a952a3a8edca58f460c198ca462)
+# set(ngsolve_addon_md5 d1b208d6aa63edce64a264e5e0370d3a)
+# file(DOWNLOAD https://raw.githubusercontent.com/NGSolve/ngsolve-addon-template/${ngsolve_addon_version}/ngsolve_addon.cmake
+#   ${CMAKE_CURRENT_SOURCE_DIR}/ngsolve_addon.cmake
+#   EXPECTED_MD5 ${ngsolve_addon_md5}
+# )
+
+set(ngsolve_addon_version 913da7921b1a1371e5b9071055efa803a0ae4567)
+set(ngsolve_addon_md5 c2c300dbf360b0018ec027fd3e659475)
+file(DOWNLOAD https://raw.githubusercontent.com/johann-cm/ngsolve-addon-template/${ngsolve_addon_version}/ngsolve_addon.cmake
   ${CMAKE_CURRENT_SOURCE_DIR}/ngsolve_addon.cmake
   EXPECTED_MD5 ${ngsolve_addon_md5}
 )
+
 include(ngsolve_addon.cmake)
 
 set(SPACETIME_SANITY_CHECKS ON CACHE BOOL "use space-time sanity checks (abuses ngsolve's intrule nr)")
@@ -54,9 +62,10 @@ add_subdirectory(lsetcurving)
 add_subdirectory(tests)
 add_subdirectory(spacetime)
 
+
 install(TARGETS xfem DESTINATION ${XFEM_INSTALL_DIR_PYTHON}/xfem)
 
-#ngsolve_generate_stub_files(xfem)
+# ngsolve_generate_stub_files(xfem)
 
 # uninstall target
 configure_file(

{xfem-2.1.2406.dev3 → xfem-2.1.2406.dev18}/Dockerfile

@@ -32,7 +32,7 @@ RUN apt-get install -y python3.12-venv python3.12-dev cmake
 RUN apt-get update
 RUN ln -s /usr/bin/python3.12 /usr/bin/python3
 
-ARG NGS_VERSION=6.2.2405
+ARG NGS_VERSION=6.2.2406
 # ARG XFEM_VERSION=v2.1.2303
 
 # install pip-packages in a virtual environment and set PYTHONPATH to the according venv-directory

{xfem-2.1.2406.dev3 → xfem-2.1.2406.dev18}/PKG-INFO

@@ -1,14 +1,14 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: xfem
-Version: 2.1.2406.dev3
+Version: 2.1.2406.dev18
 Summary: (ngs)xfem is an Add-on library to Netgen/NGSolve for unfitted/cut FEM.
 Author-Email: Christoph Lehrenfeld <lehrenfeld@math.uni-goettingen.de>
 Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
-Project-URL: Github, https://github.com/ngsxfem/ngsxfem
+Project-URL: github, https://github.com/ngsxfem/ngsxfem
 Requires-Python: >=3.9
-Requires-Dist: ngsolve==6.2.2405.post22.dev1
-Requires-Dist: pytest; extra == "test"
+Requires-Dist: ngsolve==6.2.2501
 Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
 Description-Content-Type: text/markdown
 
 [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/ngsxfem/ngsxfem/pypi.yml?branch=master&label=build%20and%20pypi&logo=github)](https://github.com/ngsxfem/ngsxfem/actions/workflows/pypi.yml) 
@@ -63,7 +63,7 @@ Not all features of `ngsxfem` and `NGSolve` can directly be combined. Here is an
 | `Tet`: trigs./tets | y | y | y | y | y | y | y | y | / | / | y |
 | `MPI`: MPI | y | y | n | y | y | y | n | n | y | y | / |
 
-Some of the *no*s are work in progress and some have not been considered so far. If you need a certain combination to work, please contact us and we will see what we can do. 
+Some of the *no*s are work in progress and some have not been considered so far. If you need a certain combination to work, please contact us and we will see what we can do (`MPI` for `Gh` is planned for the not so far future).
 
 # Examples and Documentation
 

{xfem-2.1.2406.dev3 → xfem-2.1.2406.dev18}/README.md

@@ -50,7 +50,7 @@ Not all features of `ngsxfem` and `NGSolve` can directly be combined. Here is an
 | `Tet`: trigs./tets | y | y | y | y | y | y | y | y | / | / | y |
 | `MPI`: MPI | y | y | n | y | y | y | n | n | y | y | / |
 
-Some of the *no*s are work in progress and some have not been considered so far. If you need a certain combination to work, please contact us and we will see what we can do. 
+Some of the *no*s are work in progress and some have not been considered so far. If you need a certain combination to work, please contact us and we will see what we can do (`MPI` for `Gh` is planned for the not so far future).
 
 # Examples and Documentation
 

{xfem-2.1.2406.dev3 → xfem-2.1.2406.dev18}/ngsolve_addon.cmake

@@ -5,6 +5,11 @@
 ###############################################################################
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
+# Set default build type to RelWithDebInfo
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Build type" FORCE)
+endif(NOT CMAKE_BUILD_TYPE)
+
 # Find NGSolve and Netgen using python
 if(CMAKE_VERSION VERSION_LESS "3.18")
   find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
@@ -24,6 +29,7 @@ find_package(NGSolve CONFIG REQUIRED)
 macro(add_ngsolve_addon module_name)
   # Create the module
   add_library(${module_name} SHARED ${ARGN})
+  target_include_directories(${module_name} BEFORE PRIVATE $<TARGET_PROPERTY:ngsolve,INTERFACE_INCLUDE_DIRECTORIES>)
   target_link_libraries(${module_name} PUBLIC ngsolve Python3::Module)
   set_target_properties(${module_name} PROPERTIES PREFIX "" CXX_STANDARD 17)
 
@@ -89,9 +95,16 @@ endif()
 macro(ngsolve_generate_stub_files module_name)
   set(stubgen_generation_code "execute_process(WORKING_DIRECTORY ${stubgen_working_dir} COMMAND ${Python3_EXECUTABLE} -m pybind11_stubgen --ignore-all-errors -o ${CMAKE_CURRENT_BINARY_DIR}/stubs ${module_name})")
   set(stubgen_directory "${CMAKE_CURRENT_BINARY_DIR}/stubs/${module_name}/")
+  set(stubgen_file "${CMAKE_CURRENT_BINARY_DIR}/stubs/${module_name}.pyi")
 
   install(CODE ${stubgen_generation_code})
-  install(DIRECTORY ${stubgen_directory} DESTINATION ${ADDON_INSTALL_DIR_PYTHON}/${module_name})
+  if(IS_READABLE ${stubgen_file})
+    install(FILES ${stubgen_file} DESTINATION ${ADDON_INSTALL_DIR_PYTHON}/${module_name})
+  elseif(IS_DIRECTORY ${stubgen_directory})
+    install(DIRECTORY ${stubgen_directory} DESTINATION ${ADDON_INSTALL_DIR_PYTHON}/${module_name})
+  else()
+    message(WARNING "Unable to locate and install stub files.")
+  endif()
 endmacro()
 
 message(STATUS "Install dir: ${CMAKE_INSTALL_PREFIX}")

{xfem-2.1.2406.dev3 → xfem-2.1.2406.dev18}/pyproject.toml

@@ -17,7 +17,7 @@ requires = ["setuptools>=45",
             "scikit-build-core>=0.9.0", 
             "pybind11_stubgen", 
             "cmake>=3.26.1", 
-            "ngsolve>=6.2.2405.post22.dev1",
+            "ngsolve>=6.2.2501",
             "toml;  python_version >= '3.11'", 
             "tomli>=1.1.0; python_version < '3.11'"
             ]
@@ -48,7 +48,7 @@ testpaths = ["tests"]
 
 [tool.cibuildwheel]
 #build-verbosity = 1
-manylinux-x86_64-image = "manylinux_2_28"
+manylinux-x86_64-image = "cerbsim/manylinux_2_28_x86_64_cuda_12.8"
 skip = """
   pp*
   *_i686

xfem-2.1.2406.dev18/python/_version.py

@@ -0,0 +1,21 @@
+# file generated by setuptools-scm
+# don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple
+    from typing import Union
+
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+else:
+    VERSION_TUPLE = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+
+__version__ = version = '2.1.2406.dev18'
+__version_tuple__ = version_tuple = (2, 1, 2406, 'dev18')

{xfem-2.1.2406.dev3 → xfem-2.1.2406.dev18}/spacetime/SpaceTimeFESpace.cpp

@@ -44,9 +44,10 @@ SpaceTimeFESpace :: SpaceTimeFESpace (shared_ptr<MeshAccess> ama, shared_ptr<FES
 
     // needed to draw solution function
     Switch<3> (ma->GetDimension()-1, [&] (auto SDIM) {
-        evaluator[VOL] = make_shared<T_DifferentialOperator<DiffOpId<SDIM+1>>>();
-        flux_evaluator[VOL] = make_shared<T_DifferentialOperator<DiffOpGradient<SDIM+1>>>();
-        evaluator[BND] = make_shared<T_DifferentialOperator<DiffOpIdBoundary<SDIM+1>>>();
+        constexpr int SDIM1 = SDIM+1;
+        evaluator[VOL] = make_shared<T_DifferentialOperator<DiffOpId<SDIM1>>>();
+        flux_evaluator[VOL] = make_shared<T_DifferentialOperator<DiffOpGradient<SDIM1>>>();
+        evaluator[BND] = make_shared<T_DifferentialOperator<DiffOpIdBoundary<SDIM1>>>();
     });
     //if (ma->GetDimension() < 2)
     //    throw Exception ("Unsupported spatial dimension in SpaceTimeFESpace :: SpaceTimeFESpace");

{xfem-2.1.2406.dev3 → xfem-2.1.2406.dev18}/tests/CMakeLists.txt

@@ -11,6 +11,9 @@ set(NETGEN_PYTHON_EXECUTABLE python3)
 #add_test(NAME pytests_ngsolve_version COMMAND ${NETGEN_PYTHON_EXECUTABLE} -m pytest
 #  "${PROJECT_SOURCE_DIR}/tests/pytests/test_ngsolve_version.py" WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/tests")
 
+add_test(NAME py_demo_import_xfem COMMAND ${NETGEN_PYTHON_EXECUTABLE} 
+  "-c" "\"import xfem\"")
+
 add_test(NAME py_demo_tracefem COMMAND ${NETGEN_PYTHON_EXECUTABLE} 
   "${PROJECT_SOURCE_DIR}/demos/tracefem.py" "testmode")
 

{xfem-2.1.2406.dev3 → xfem-2.1.2406.dev18}/xfem/symboliccutbfi.cpp

@@ -102,6 +102,7 @@ namespace ngfem
       trial_difforder = min(trial_difforder, proxy->Evaluator()->DiffOrder());
     for (auto proxy : test_proxies)
       test_difforder = min(test_difforder, proxy->Evaluator()->DiffOrder());
+    if (trial_proxies.Size() == 0) trial_difforder = 0;
 
     int intorder = fel_trial.Order()+fel_test.Order();
 
@@ -1951,6 +1952,7 @@ namespace ngfem
       trial_difforder = min(trial_difforder, proxy->Evaluator()->DiffOrder());
     for (auto proxy : test_proxies)
       test_difforder = min(test_difforder, proxy->Evaluator()->DiffOrder());
+    if (trial_proxies.Size() == 0) trial_difforder = 0;
 
     int intorder = fel_trial.Order()+fel_test.Order();
 
@@ -1998,17 +2000,21 @@ namespace ngfem
 			  for (auto proxy : test_proxies)
         {
 			  	HeapReset hr(lh);
-			  	FlatMatrix<SIMD<double>> proxyvalues(simd_mir.Size(), proxy->Dimension(), lh);
+			  	FlatMatrix<SIMD<double>> proxyvalues(proxy->Dimension(), simd_mir.Size(), lh);
 			  	for (int k = 0; k < proxy->Dimension(); k++)
 			  	{
 			  		ud.testfunction = proxy;
 			  		ud.test_comp = k;
-			  		cf -> Evaluate (simd_mir, val);
-			  		proxyvalues.Col(k) = val.Col(0);
+			  		cf -> Evaluate (simd_mir, proxyvalues.Rows(k,k+1));
 			  	}
   
-			  	for (int i = 0; i < simd_mir.Size(); i++)
-			  		proxyvalues.Row(i) *= simd_mir[i].GetMeasure()*simd_wei_arr[i];
+              
+          for (size_t i = 0; i < proxyvalues.Height(); i++)
+            {
+              auto row = proxyvalues.Row(i);
+              for (size_t j = 0; j < row.Size(); j++)
+                row(j) *= simd_mir[j].GetMeasure()*simd_wei_arr[j];
+            }  
   
 			  	proxy->Evaluator()->AddTrans(fel_test, simd_mir, proxyvalues, ely);
 			  }
@@ -2086,6 +2092,7 @@ namespace ngfem
       trial_difforder = min(trial_difforder, proxy->Evaluator()->DiffOrder());
     for (auto proxy : test_proxies)
       test_difforder = min(test_difforder, proxy->Evaluator()->DiffOrder());
+    if (trial_proxies.Size() == 0) trial_difforder = 0;
 
     int intorder = fel_trial.Order()+fel_test.Order();
 

xfem-2.1.2406.dev3/python/_version.py

@@ -1,16 +0,0 @@
-# file generated by setuptools_scm
-# don't change, don't track in version control
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple, Union
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-else:
-    VERSION_TUPLE = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-
-__version__ = version = '2.1.2406.dev3'
-__version_tuple__ = version_tuple = (2, 1, 2406, 'dev3')