Merge branch 'enable-win-mkl' into 'master'

[ci] Re-enable MKL on windows. See merge request ogs/ogs!5148
ufz · Nov 1, 2024 · 6efb29f · 6efb29f
2 parents fcef847 + 99a5c59
commit 6efb29f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/scripts/ci/extends/vs2019-environment.yml b/scripts/ci/extends/vs2019-environment.yml
@@ -18,5 +18,6 @@
   before_script:
     - *load_vs_env
     # Load MKL environment
-    - '& "C:\Program Files (x86)\Intel\oneAPI\setvars.bat"'
-    - $env:PATH += ";C:\Program Files (x86)\Intel\oneAPI\compiler\latest\windows\redist\intel64_win\compiler"
+    - '& "C:\Program Files (x86)\Intel\oneAPI\compiler\2022.1.0\env\vars.bat"'
+    - '& "C:\Program Files (x86)\Intel\oneAPI\mkl\2022.1.0\env\vars.bat"'
+    - $env:PATH += ";C:\Program Files (x86)\Intel\oneAPI\compiler\2022.1.0\windows\redist\intel64_win\compiler"
diff --git a/scripts/ci/jobs/build-win.yml b/scripts/ci/jobs/build-win.yml
@@ -1,16 +1,17 @@
 build win:
   extends:
     - .template-build-win
+    # oneAPI MKL results in Stack overflow during compilation of MathLib on Visual Studio 2022
+    # therefore using 2019
     - .vs-environment
-    # oneAPI 2024 results in Stack overflow during compilation of MathLib
-    # - .vs-mkl-environment
+    - .vs-mkl-environment
   variables:
     CHECK_WARNINGS: "true"
     CMAKE_PRESET: release
-    # -DOGS_USE_MKL=ON
     CMAKE_ARGS: >-
       -DOGS_CI_TESTRUNNER_REPEAT=1
       -DOGS_USE_PIP=ON
+      -DOGS_USE_MKL=ON
 
 build win msvc:
   extends:

diff --git a/scripts/cmake/BuildExternalProject.cmake b/scripts/cmake/BuildExternalProject.cmake
@@ -29,7 +29,11 @@ macro(BuildExternalProject_set_build_dir target argn_string)
             IS_PREFIX PROJECT_BINARY_DIR "${CPM_SOURCE_CACHE}" _is_inside_build
         )
         if(NOT _is_inside_build)
-            string(SHA256 _hash "${CMAKE_GENERATOR};${argn_string}")
+            string(
+                SHA256
+                    _hash
+                    "${CMAKE_GENERATOR};${argn_string}${MSVC_TOOLSET_VERSION}"
+            )
             set(build_dir "${CPM_SOURCE_CACHE}/_ext/${target}/${_hash}")
         endif()
     endif()