Merge master into branch

.github/workflows/build.yml

@@ -22,10 +22,10 @@ jobs:
         include:
           - os: ubuntu-latest
             config: Release
-            container: ghcr.io/viennatools/vienna-builder:vtk
+            container: ghcr.io/viennatools/vienna-builder:suite
           - os: ubuntu-latest
             config: Debug
-            container: ghcr.io/viennatools/vienna-builder:vtk
+            container: ghcr.io/viennatools/vienna-builder:suite
 
     runs-on: ${{ matrix.os }}
     container: ${{ matrix.container }}
@@ -51,4 +51,4 @@ jobs:
         run: cmake -DVIENNALS_BUILD_TESTS=ON -B build && cmake --build build --config ${{ matrix.config }}
 
       - name: 🧪 Test
-        run: ctest -E "Benchmark|Performance" -C ${{ matrix.config }} --test-dir build
+        run: ctest --output-on-failure -E "Benchmark|Performance" -C ${{ matrix.config }} --test-dir build

.github/workflows/format.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   check-coding-style:
     runs-on: ubuntu-latest
-    container: ghcr.io/viennatools/vienna-builder:vtk-python
+    container: ghcr.io/viennatools/vienna-builder:suite-python
 
     steps:
       - name: 📥 Checkout

.github/workflows/python.yml

@@ -13,7 +13,7 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            container: ghcr.io/viennatools/vienna-builder:vtk-python
+            container: ghcr.io/viennatools/vienna-builder:suite-python
           - os: windows-latest
           - os: macos-latest
 
@@ -55,7 +55,7 @@ jobs:
         if: ${{ matrix.os != 'windows-latest' }}
         run: |
           python -m venv venv
-          ./venv/bin/pip install .
+          CMAKE_ARGS=-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF ./venv/bin/pip install . # Alpine does not like LTO
           ./venv/bin/python -c "import viennals2d; print(viennals2d.__doc__)"
 
       - name: 📦 Upload Artifact
@@ -95,21 +95,18 @@ jobs:
       - name: 🛠️ Build VTK (Windows)
         if: ${{ matrix.os == 'windows-latest' }}
         run: |
-          # sed -i 's/\(DVIENNALS_BUILD_PYTHON=ON"\)/\1,"-DVIENNALS_PACKAGE_PYTHON=ON"/g' pyproject.toml
           sed -i 's/\(DVIENNALS_BUILD_PYTHON=ON"\)/\1,"-DVIENNALS_PACKAGE_PYTHON=ON","-DVIENNALS_IS_CI=ON"/g' pyproject.toml
           type pyproject.toml
 
       - name: 🛠️ Build VTK (MacOs)
         if: ${{ matrix.os == 'macos-latest' }}
         run: |
-          # sed -i .bak 's/\(DVIENNALS_BUILD_PYTHON=ON"\)/\1,"-DVIENNALS_PACKAGE_PYTHON=ON"/g' pyproject.toml
           sed -i .bak 's/\(DVIENNALS_BUILD_PYTHON=ON"\)/\1,"-DVIENNALS_PACKAGE_PYTHON=ON","-DVIENNALS_IS_CI=ON"/g' pyproject.toml
           cat pyproject.toml
 
       - name: 🛠️ Use VTK-Python Libs
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: |
-          # sed -i 's/\(DVIENNALS_BUILD_PYTHON=ON"\)/\1,"-DVIENNALS_VTK_PYTHON_LIBS=ON"/g' pyproject.toml
           sed -i 's/\(DVIENNALS_BUILD_PYTHON=ON"\)/\1,"-DVIENNALS_PACKAGE_PYTHON=ON","-DVIENNALS_IS_CI=ON"/g' pyproject.toml
           cat pyproject.toml
 

CMakeLists.txt

@@ -109,7 +109,7 @@ CPMAddPackage(
 
 CPMAddPackage(
   NAME PackageProject
-  VERSION 1.11.1
+  VERSION 1.11.2
   GIT_REPOSITORY "https://github.com/TheLartians/PackageProject.cmake"
   EXCLUDE_FROM_ALL ${VIENNALS_BUILD_PYTHON})
 
@@ -128,11 +128,6 @@ if(VIENNALS_USE_VTK AND VIENNALS_VTK_PYTHON_LIBS)
 elseif(VIENNALS_USE_VTK)
   enable_language(C)
 
-  find_package(VTK QUIET)
-  set(VIENNALS_SYSTEM_VTK
-      ${VTK_FOUND}
-      CACHE INTERNAL "")
-
   CPMFindPackage(
     NAME VTK
     # TODO: Change to 9.3.1 as soon as it's released
@@ -194,16 +189,6 @@ if(VIENNALS_ENABLE_SANITIZER)
   viennacore_enable_sanitizer()
 endif()
 
-# --------------------------------------------------------------------------------------------------------
-# Check need for environment setups
-# --------------------------------------------------------------------------------------------------------
-
-if(NOT VIENNALS_VTK_PYTHON_LIBS AND (NOT VIENNALS_SYSTEM_VTK OR VIENNALS_PACKAGE_PYTHON))
-  set(VIENNALS_VTK_ENV
-      ON
-      CACHE INTERNAL "")
-endif()
-
 # --------------------------------------------------------------------------------------------------------
 # Setup Shared/Static Library
 # --------------------------------------------------------------------------------------------------------

cmake/vtk.cmake

@@ -1,6 +1,11 @@
 macro(setup_vtk_env TARGET OUTPUT)
   message(STATUS "[ViennaLS] Setting up VTK-Environment for ${TARGET}")
 
+  if(NOT TARGET vtksys)
+    message(WARNING "[ViennaLS] Could not find VTK-Target")
+    return()
+  endif()
+
   # We expect all of the VTK binaries to be present in the same directory to which "vtksys" is
   # built. This is currently the case, and has been the case for prior vtk versions - However we
   # should keep an eye on this.

examples/CMakeLists.txt

@@ -1,6 +1,6 @@
 add_custom_target(ViennaLS_Examples ALL)
 
-if(WIN32 AND VIENNALS_VTK_ENV)
+if(WIN32)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${PROJECT_BINARY_DIR}/examples>)
   setup_vtk_env(ViennaLS_Examples ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 endif()

include/viennals/lsGeometricAdvect.hpp

@@ -469,7 +469,7 @@ template <class T, int D> class GeometricAdvect {
           }
         }
       } // domainBounds for
-    } // parallel region
+    }   // parallel region
 
     // copy all points into the first vector
     {

python/CMakeLists.txt

@@ -69,9 +69,10 @@ target_compile_definitions(viennals3d PRIVATE -DVIENNALS_PYTHON_DIMENSION=3
 
 set(VIENNALS_LIB_FOLDER ${VIENNALS_LIBRARY_OUTPUT_DIR}/viennals.libs)
 
-if(NOT VIENNALS_VTK_ENV)
-  return()
-endif()
+# Not required for both targets, one will suffice
+setup_vtk_env(viennals2d ${VIENNALS_LIB_FOLDER})
 
-setup_vtk_env(viennals2d ${VIENNALS_LIB_FOLDER}) # Not required for both targets, one will suffice
-install(DIRECTORY ${VIENNALS_LIB_FOLDER} DESTINATION .)
+install(
+  DIRECTORY ${VIENNALS_LIB_FOLDER}
+  DESTINATION .
+  OPTIONAL)

tests/CMakeLists.txt

@@ -1,6 +1,6 @@
 add_custom_target(ViennaLS_Tests ALL)
 
-if(WIN32 AND VIENNALS_VTK_ENV)
+if(WIN32)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${PROJECT_BINARY_DIR}/tests>)
   setup_vtk_env(ViennaLS_Tests ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 endif()