Merge branch 'win-fixes' into 'master'

[ci] Win fixes

See merge request ogs/ogs!4456

Tests/Data/requirements.txt

 ogstools==0.0.3
 gmsh==4.11.0
-h5py==3.7.0
+h5py==3.8.0
 -e git+https://github.com/joergbuchwald/heatsource_thm@bbd5bab17fc2ec228c773e087dc847e1ad5f9a4c#egg=heatsource-py
 jupyterlab==3.4.8
-matplotlib==3.5.1
+matplotlib==3.6.3
 numpy==1.23.4
 -e git+https://github.com/joergbuchwald/ogs6py@71f49a896381152e648801740833450022115981#egg=ogs6py
 pandas==1.4.2

scripts/ci/extends/template-build-win.yml

@@ -3,7 +3,6 @@
   tags:
     - windows
   extends:
-    - .vs2019-environment
     - .test-artifacts
   needs: [meta]
   variables:

scripts/ci/extends/vs2022-environment.yml

+.vs2022-environment:
+  before_script:
+    # Load VS environment
+    - |
+      pushd $env:VS170COMNTOOLS
+      cmd /c "VsDevCmd.bat -arch=amd64 -host_arch=amd64&set" |
+      foreach {
+        if ($_ -match "=") {
+          $v = $_.split("=", 2); set-item -force -path "ENV:\$($v[0])"  -value "$($v[1])"
+        }
+      }
+      popd
+      Write-Host "`nVisual Studio Command Prompt variables set." -ForegroundColor Yellow

scripts/ci/jobs/build-gui-win.yml

 build gui win:
-  extends: .template-build-win
+  extends:
+    - .template-build-win
+    - .vs2019-environment
   rules:
     - if: '$CI_COMMIT_BRANCH == "master"'
       variables:
-        ADDITIONAL_CMAKE_ARGS: " -DOGS_BUILD_CLI=ON"
+        ADDITIONAL_CMAKE_ARGS: " -DOGS_BUILD_CLI=ON -DOGS_BUILD_PROCESS_TH2M=OFF"
         BUILD_TESTS: "false"
         BUILD_CTEST: "false"
     - if: $CI_COMMIT_BRANCH =~ /^v[0-9]\.[0-9]\.[0-9]/
@@ -16,6 +18,7 @@ build gui win:
     CMAKE_ARGS: >-
       -DOGS_$USE_PYTHON
       -DOGS_CI_TESTRUNNER_REPEAT=1
+      -DOGS_BUILD_PROCESSES=SteadyStateDiffusion
       $ADDITIONAL_CMAKE_ARGS
   parallel:
     matrix:

scripts/ci/jobs/build-win.yml

 build win:
-  extends: .template-build-win
+  extends:
+    - .template-build-win
+    - .vs2019-environment
   rules:
     - if: "$USE_PYTHON =~ /ON$/"
     - if: '$CI_COMMIT_BRANCH == "master"'
@@ -21,7 +23,9 @@ build win:
       - USE_PYTHON: ["USE_PYTHON=ON", "USE_PYTHON=OFF"]
 
 build win msvc:
-  extends: .template-build-win
+  extends:
+    - .template-build-win
+    - .vs2019-environment
   rules:
     - if: '$CI_COMMIT_BRANCH == "master"'
     - if: $CI_COMMIT_BRANCH =~ /^v[0-9]\.[0-9]\.[0-9]/

scripts/cmake/Dependencies.cmake

@@ -66,7 +66,7 @@ endif()
 
 if(OGS_USE_PYTHON OR OGS_BUILD_PYTHON_MODULE)
     CPMAddPackage(
-        NAME pybind11 GITHUB_REPOSITORY pybind/pybind11 VERSION 2.10.0
+        NAME pybind11 GITHUB_REPOSITORY pybind/pybind11 VERSION 2.10.3
     )
 endif()
 

scripts/cmake/DependenciesExternalProject.cmake

@@ -16,6 +16,15 @@ if(CCACHE_EXECUTABLE)
     )
 endif()
 
+if(MSVC)
+    find_program(NINJA_CMD ninja)
+    if(NINJA_CMD)
+        # When ninja is available use it to speed up builds
+        set(_cmake_generator CMAKE_GENERATOR Ninja)
+        message(STATUS "Ninja generator will be used for external projects.")
+    endif()
+endif()
+
 if(OGS_USE_MFRONT)
     option(OGS_BUILD_TFEL
            "Build TFEL locally. Needs to be set with a clean cache!" OFF
@@ -243,6 +252,7 @@ endif()
 if(NOT HDF5_FOUND)
     BuildExternalProject(
         HDF5 ${_hdf5_source} CMAKE_ARGS ${_hdf5_options} ${_defaultCMakeArgs}
+        ${_cmake_generator}
     )
     message(
         STATUS
@@ -321,7 +331,7 @@ if(NOT VTK_FOUND)
     endif()
     BuildExternalProject(
         VTK ${_vtk_source} CMAKE_ARGS ${VTK_OPTIONS} ${_defaultCMakeArgs}
-                                      ${_loguru_patch}
+                                      ${_loguru_patch} ${_cmake_generator}
     )
     message(
         STATUS

scripts/cmake/PythonSetup.cmake

@@ -2,10 +2,13 @@
 
 if(OGS_USE_PYTHON)
     set(_python_version_max "...<3.12")
+    if(WIN32)
+        # 3.11 crashes at initialization on Windows.
+        set(_python_version_max "...<3.11")
+    endif()
 endif()
 
 if(OGS_USE_PIP)
-    set(_python_version_max "...<3.11") # There are no VTK wheels for >3.10
     set(Python_ROOT_DIR ${PROJECT_BINARY_DIR}/.venv)
     set(CMAKE_REQUIRE_FIND_PACKAGE_Python TRUE)
     if(NOT EXISTS ${PROJECT_BINARY_DIR}/.venv)

scripts/cmake/test/NotebookTest.cmake

@@ -56,7 +56,7 @@ function(NotebookTest)
 
     set(timeout ${ogs.ctest.large_runtime})
     if(DEFINED NotebookTest_RUNTIME)
-        math(EXPR timeout "${NotebookTest_RUNTIME} * 5")
+        math(EXPR timeout "${NotebookTest_RUNTIME} * 10")
     else()
         set(NotebookTest_RUNTIME 1)
     endif()

web/data/versions.json

@@ -19,7 +19,7 @@
     "petsc": "3.16.3",
     "qt": "5.14.2",
     "python": "3.6",
-    "snakemake": "7.15.2",
+    "snakemake": "7.20.0",
     "hdf5": "1.12.1",
     "libxml2": "2.9.12",
     "tfel-rliv": "4.0",
@@ -68,8 +68,8 @@
     }
   },
   "cpm": {
-    "package_file_id": 287,
-    "package_file_sha256": "71eade2d4bbcdeecf09124ecc31b8451009cdb8d93697352d69d437d418defb6"
+    "package_file_id": 296,
+    "package_file_sha256": "1656d651d48fef21147da92a4f1a3e38206c427f6afa9d53d127483c6d946d10"
   },
   "ext": {
     "cache_hash": "4ebd62e0ce484732dbf3cd9932f60b67762e156b"