From c12584665024737f177d831256c6fb891104b133 Mon Sep 17 00:00:00 2001 From: scivision Date: Fri, 14 Jul 2023 09:45:31 -0400 Subject: [PATCH] mumps upstream 5.6.1 fixes #61 --- CMakeLists.txt | 4 ++-- README.md | 8 +++++++- Readme_options.md | 2 +- cmake/libraries.json | 8 +++++++- scripts/test_mumps_versions.cmake | 2 +- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 79fc863..28c106e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(MUMPS LANGUAGES C Fortran -VERSION 5.6.0.0 +VERSION 5.6.1.0 DESCRIPTION "Sparse direct parallel solver" HOMEPAGE_URL "http://mumps-solver.org/" ) @@ -20,7 +20,7 @@ else() endif() if(NOT MUMPS_UPSTREAM_VERSION) - set(MUMPS_UPSTREAM_VERSION 5.6.0) + set(MUMPS_UPSTREAM_VERSION 5.6.1) endif() if(MSVC AND BUILD_SHARED_LIBS) diff --git a/README.md b/README.md index a4658ca..e2cb586 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,18 @@ [![ci_windows](https://github.com/scivision/mumps/actions/workflows/ci_windows.yml/badge.svg)](https://github.com/scivision/mumps/actions/workflows/ci_windows.yml) [![oneapi-linux](https://github.com/scivision/mumps/actions/workflows/oneapi-linux.yml/badge.svg)](https://github.com/scivision/mumps/actions/workflows/oneapi-linux.yml) -CMake downloads the source tarfile from MUMPS developer websites and builds. +CMake downloads the unmodified source tarfile from MUMPS developers and builds. CMake builds MUMPS in parallel faster and more conveniently than the original Makefiles. CMake allows easy reuse of MUMPS in external projects via CMake [FetchContent](https://github.com/scivision/mumps-fetchcontent) or ExternalProject or `cmake --install`. +[MUMPS CeCILL-C license](https://mumps-solver.org/index.php?page=dwnld#license) +is distinct from this CMake script license. +MUMPS teams typically make new +[releases](https://mumps-solver.org/index.php?page=dwnld#cl) +each year. + Many compilers and systems are supported by CMake build system on Windows, MacOS and Linux. Static (default) or Shared `cmake -DBUILD_SHARED_LIBS=on` MUMPS builds are supported. diff --git a/Readme_options.md b/Readme_options.md index bdfdc57..067dc12 100644 --- a/Readme_options.md +++ b/Readme_options.md @@ -24,7 +24,7 @@ The MUMPS version defaults to a recent release. For reproducibility, benchmarking and other purposes, one may select the version of MUMPS to build like: ```sh -cmake -B build -DMUMPS_UPSTREAM_VERSION=5.6.0 +cmake -B build -DMUMPS_UPSTREAM_VERSION=5.6.1 ``` The MUMPS_UPSTREAM_VERSION works for MUMPS versions in diff --git a/cmake/libraries.json b/cmake/libraries.json index a6dd6a7..ed987bc 100644 --- a/cmake/libraries.json +++ b/cmake/libraries.json @@ -88,7 +88,13 @@ "sha256": "3e08c1bdea7aaaba303d3cf03059f3b4336fa49bef93f4260f478f067f518289", "urls": [ "https://zenodo.org/record/7888117/files/MUMPS_5.6.0.tar.gz?download=1", - "https://graal.ens-lyon.fr/MUMPS/MUMPS_5.6.0.tar.gz" + "https://mumps-solver.org/MUMPS_5.6.0.tar.gz" + ] + }, + "5.6.1": { + "sha256": "1920426d543e34d377604070fde93b8d102aa38ebdf53300cbce9e15f92e2896", + "urls": [ + "https://mumps-solver.org/MUMPS_5.6.1.tar.gz" ] } } diff --git a/scripts/test_mumps_versions.cmake b/scripts/test_mumps_versions.cmake index f1f917f..ab8a41b 100644 --- a/scripts/test_mumps_versions.cmake +++ b/scripts/test_mumps_versions.cmake @@ -3,7 +3,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/tempdir.cmake) -foreach(u IN ITEMS 4.8.4 4.9.2 5.0.2 5.1.2 5.2.1 5.3.5 5.4.1 5.5.1 5.6.0) +foreach(u IN ITEMS 4.8.4 4.9.2 5.0.2 5.1.2 5.2.1 5.3.5 5.4.1 5.5.1 5.6.1) get_temp_dir(bindir) message(STATUS "Testing MUMPS ${u} in ${bindir}")