From 69df9a3993599c494b62a7fa5b5e95fb4125310f Mon Sep 17 00:00:00 2001 From: jstebel Date: Mon, 11 May 2026 12:13:42 +0200 Subject: [PATCH] Updatwe config for version 4.0.5. --- dockerfiles/flow-dev-gnu/libs-build-gnu/petsc/Makefile | 2 ++ .../libs-intel/libs-build-intel/yamlcpp/Makefile | 4 ++-- images_version | 2 +- makefile | 10 +++++----- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dockerfiles/flow-dev-gnu/libs-build-gnu/petsc/Makefile b/dockerfiles/flow-dev-gnu/libs-build-gnu/petsc/Makefile index c960b31..6be2b12 100644 --- a/dockerfiles/flow-dev-gnu/libs-build-gnu/petsc/Makefile +++ b/dockerfiles/flow-dev-gnu/libs-build-gnu/petsc/Makefile @@ -25,6 +25,7 @@ cfg_opt_Debug= \ --download-metis=yes --download-parmetis=yes \ --download-blacs=yes --download-scalapack=yes \ --download-mumps=yes --download-hypre=https://github.com/hypre-space/hypre/archive/v$(hypre_version).tar.gz \ + --download-cmake=yes \ --with-debugging=1 --with-shared-libraries=1 \ --with-make-np $(n_jobs) \ --CFLAGS="-O" \ @@ -35,6 +36,7 @@ cfg_opt_Release= \ --download-metis=yes --download-parmetis=yes \ --download-blacs=yes --download-scalapack=yes \ --download-mumps=yes --download-hypre=https://github.com/hypre-space/hypre/archive/v$(hypre_version).tar.gz \ + --download-cmake=yes \ --with-debugging=0 --with-shared-libraries=1 \ --with-make-np $(n_jobs) \ --CFLAGS="-O3 -DNDEBUG" \ diff --git a/dockerfiles/libs-intel/libs-build-intel/yamlcpp/Makefile b/dockerfiles/libs-intel/libs-build-intel/yamlcpp/Makefile index cb66bf6..26ffd81 100644 --- a/dockerfiles/libs-intel/libs-build-intel/yamlcpp/Makefile +++ b/dockerfiles/libs-intel/libs-build-intel/yamlcpp/Makefile @@ -1,8 +1,8 @@ # Simple makefile for building and packaging project Yaml cpp library=yamlcpp -url=https://flow.nti.tul.cz/libraries/yaml-cpp-yaml-cpp-$(version).zip -base_name=yaml-cpp-yaml-cpp-$(version) +url=https://flow.nti.tul.cz/libraries/yaml-cpp-$(version).zip +base_name=yaml-cpp-$(version) # In order to combine staticaly linked yamlcpp with dynamicaly linked res of the code. CXX_FLAGS=-fPIE diff --git a/images_version b/images_version index c4e41f9..7636e75 100644 --- a/images_version +++ b/images_version @@ -1 +1 @@ -4.0.3 +4.0.5 diff --git a/makefile b/makefile index c24702b..8bd27a9 100644 --- a/makefile +++ b/makefile @@ -13,12 +13,12 @@ build_gnu=$(build) -f Dockerfile-gnu build_intel=$(build) -f Dockerfile-intel run=docker run -v ${PWD}/$(build_dir):/build_dir -w /build_dir versions=--build-arg ver_yamlcpp=0e6e28d \ - --build-arg ver_armadillo=12.2.0 \ - --build-arg ver_mpich=4.0.3 \ - --build-arg ver_petsc=v3.18.6 \ - --build-arg ver_hypre=2.25.0 \ + --build-arg ver_armadillo=15.2.4 \ + --build-arg ver_mpich=5.0.1 \ + --build-arg ver_hypre=3.1.0 \ + --build-arg ver_petsc=3.25.0 \ --build-arg ver_bddcml=2.6 \ - --build-arg ver_permon=3.18.0 + --build-arg ver_permon=3.25.0 ver_boost=--build-arg boost_version=1.74 # TODO: write versions available into the image and use autoamticaly in Flow123d configuration