From 6ff6f182676a7d497ef96e3e3cdc2fd8a2e430f6 Mon Sep 17 00:00:00 2001 From: Boris Basic <boris.basic@edf.fr> Date: Thu, 30 Mar 2023 17:31:44 +0200 Subject: [PATCH] Downgrade MUMPS to 5.2.1 as this is an officially supported version --- build-telemac-deps.bat | 4 ++-- config/pysource.win.bat | 2 +- config/pysource.win.debug.bat | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-telemac-deps.bat b/build-telemac-deps.bat index 22d033e..5325ad1 100644 --- a/build-telemac-deps.bat +++ b/build-telemac-deps.bat @@ -12,7 +12,7 @@ set metis=metis-5.1.0 set msmpi=msmpi-10.1.2 set openblas=openblas-0.3.21 set scalapack=scalapack-2.1.0 -set mumps=mumps-5.4.1 +set mumps=mumps-5.2.1 set aed2=libaed2-1.2.0 set gotm=gotm-2019-06-14-opentelemac @@ -235,7 +235,7 @@ rem MUMPS rem ***** :build_mumps call :download %mumps% "https://github.com/scivision/mumps/archive/refs/tags/v5.4.1.11.zip" || exit /b 1 -set cmake_config_options=-DBLAS_LIBRARY=%install_path%/%openblas%/lib/libopenblas.a -DLAPACK_LIBRARY=%install_path%/%openblas%/lib/libopenblas.a -DSCALAPACK_ROOT:PATH=%install_path%/%scalapack% +set cmake_config_options=-DMUMPS_UPSTREAM_VERSION=5.2.1 -DBLAS_LIBRARY=%install_path%/%openblas%/lib/libopenblas.a -DLAPACK_LIBRARY=%install_path%/%openblas%/lib/libopenblas.a -DSCALAPACK_ROOT:PATH=%install_path%/%scalapack% if %compiler% == mingw ( set cmake_config_options=%cmake_config_options% -DMPI_ROOT:PATH=%install_path%/%msmpi% ) else ( diff --git a/config/pysource.win.bat b/config/pysource.win.bat index 5715abd..64caa4b 100644 --- a/config/pysource.win.bat +++ b/config/pysource.win.bat @@ -44,7 +44,7 @@ set PATH=%MPIHOME%\bin;%PATH% rem OPENBLAS, SCALAPACK and MUMPS set OPENBLASHOME=%TELEMACDEPS%\openblas-0.3.21 set SCALAPACKHOME=%TELEMACDEPS%\scalapack-2.1.0 -set MUMPSHOME=%TELEMACDEPS%\mumps-5.4.1 +set MUMPSHOME=%TELEMACDEPS%\mumps-5.2.1 rem AED set AEDHOME=%TELEMACDEPS%\libaed2-1.2.0 rem GOTM diff --git a/config/pysource.win.debug.bat b/config/pysource.win.debug.bat index af67ffe..183cd7c 100644 --- a/config/pysource.win.debug.bat +++ b/config/pysource.win.debug.bat @@ -44,7 +44,7 @@ set PATH=%MPIHOME%\bin;%PATH% rem OPENBLAS, SCALAPACK and MUMPS set OPENBLASHOME=%TELEMACDEPS%\openblas-0.3.21 set SCALAPACKHOME=%TELEMACDEPS%\scalapack-2.1.0 -set MUMPSHOME=%TELEMACDEPS%\mumps-5.4.1 +set MUMPSHOME=%TELEMACDEPS%\mumps-5.2.1 rem AED set AEDHOME=%TELEMACDEPS%\libaed2-1.2.0 rem GOTM -- GitLab