From 7b1d0285e4312f79baea4966c6eba63279045859 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Fri, 22 Dec 2023 08:41:31 +0100 Subject: [PATCH 1/3] [ci] Fix container job. --- scripts/ci/jobs/package.yml | 1 + scripts/cmake/DependenciesExternalProject.cmake | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/ci/jobs/package.yml b/scripts/ci/jobs/package.yml index 9ee6cee6dc5..168cd66108d 100644 --- a/scripts/ci/jobs/package.yml +++ b/scripts/ci/jobs/package.yml @@ -62,6 +62,7 @@ create cpm cache: - cd ext - wget --no-verbose --output-document tfel-rliv-${TFEL_RLIV_VERSION}.zip https://github.com/thelfer/tfel/archive/refs/heads/rliv-${TFEL_RLIV_VERSION}.zip - wget --no-verbose --output-document petsc-v${PETSC_VERSION}.zip https://gitlab.com/petsc/petsc/-/archive/v${PETSC_VERSION}/petsc-v${PETSC_VERSION}.zip + # Remove after upgrading PETSc to > 3.18 - wget --no-verbose --output-document f2cblaslapack-3.4.2.q4.tar.gz http://ftp.mcs.anl.gov/pub/petsc/externalpackages/f2cblaslapack-3.4.2.q4.tar.gz - wget --no-verbose --output-document lis-${LIS_VERSION}.zip https://github.com/anishida/lis/archive/refs/tags/${LIS_VERSION}.zip - wget --no-verbose --output-document hdf5-${HDF5_VERSION}.zip https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-${HDF5_VERSION//./_}.zip diff --git a/scripts/cmake/DependenciesExternalProject.cmake b/scripts/cmake/DependenciesExternalProject.cmake index 297fad4c3b9..80e284447d4 100644 --- a/scripts/cmake/DependenciesExternalProject.cmake +++ b/scripts/cmake/DependenciesExternalProject.cmake @@ -159,12 +159,18 @@ if(OGS_USE_PETSC) endif() unset(ENV{PETSC_DIR}) + # Remove after upgrading PETSc to > 3.18 + file( + DOWNLOAD + http://ftp.mcs.anl.gov/pub/petsc/externalpackages/f2cblaslapack-3.4.2.q4.tar.gz + ${CMAKE_CURRENT_BINARY_DIR}/f2cblaslapack-3.4.2.q4.tar.gz + ) BuildExternalProject( PETSc ${_petsc_source} LOG_OUTPUT_ON_FAILURE ON CONFIGURE_COMMAND ./configure - --download-f2cblaslapack=1 + --download-f2cblaslapack=${CMAKE_CURRENT_BINARY_DIR}/f2cblaslapack-3.4.2.q4.tar.gz --prefix= --download-hypre --with-debugging=$ From 889b36813db2924e61215a046941949f955b6d36 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Fri, 22 Dec 2023 08:52:06 +0100 Subject: [PATCH 2/3] Upgraded PETSc minimum to 3.18.6. Workarounds for 3.16 can be reverted. 3.16 does not build on recent Arch, make 4.4.1, see https://gitlab.com/petsc/petsc/-/merge_requests/6140 --- ThirdParty/container-maker | 2 +- scripts/ci/jobs/package.yml | 5 +---- scripts/cmake/DependenciesExternalProject.cmake | 10 ++-------- web/data/versions.json | 2 +- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker index f67a7bfd019..4f14f402122 160000 --- a/ThirdParty/container-maker +++ b/ThirdParty/container-maker @@ -1 +1 @@ -Subproject commit f67a7bfd0198d932a6c8fdaf66af64e8562e0558 +Subproject commit 4f14f402122cfbb3f8ce7c1b47ce79510c40962f diff --git a/scripts/ci/jobs/package.yml b/scripts/ci/jobs/package.yml index 168cd66108d..586fad8e534 100644 --- a/scripts/ci/jobs/package.yml +++ b/scripts/ci/jobs/package.yml @@ -62,8 +62,6 @@ create cpm cache: - cd ext - wget --no-verbose --output-document tfel-rliv-${TFEL_RLIV_VERSION}.zip https://github.com/thelfer/tfel/archive/refs/heads/rliv-${TFEL_RLIV_VERSION}.zip - wget --no-verbose --output-document petsc-v${PETSC_VERSION}.zip https://gitlab.com/petsc/petsc/-/archive/v${PETSC_VERSION}/petsc-v${PETSC_VERSION}.zip - # Remove after upgrading PETSc to > 3.18 - - wget --no-verbose --output-document f2cblaslapack-3.4.2.q4.tar.gz http://ftp.mcs.anl.gov/pub/petsc/externalpackages/f2cblaslapack-3.4.2.q4.tar.gz - wget --no-verbose --output-document lis-${LIS_VERSION}.zip https://github.com/anishida/lis/archive/refs/tags/${LIS_VERSION}.zip - wget --no-verbose --output-document hdf5-${HDF5_VERSION}.zip https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-${HDF5_VERSION//./_}.zip - wget --no-verbose --output-document vtk-v${VTK_VERSION}.zip https://github.com/Kitware/VTK/archive/refs/tags/v${VTK_VERSION}.zip @@ -104,5 +102,4 @@ offline configure: rm CMakeCache.txt cmake ../../ogs -B . -G Ninja --preset release-petsc \ -DOGS_DOWNLOAD_CPM_CACHE=ON \ - -DOGS_USE_MFRONT=ON -DOGS_USE_LIS=ON -DOGS_EXTERNAL_DEPENDENCIES_CACHE=./ext \ - -DOGS_PETSC_CONFIG_OPTIONS="--download-f2cblaslapack=$PWD/ext/f2cblaslapack-3.4.2.q4.tar.gz" + -DOGS_USE_MFRONT=ON -DOGS_USE_LIS=ON -DOGS_EXTERNAL_DEPENDENCIES_CACHE=./ext diff --git a/scripts/cmake/DependenciesExternalProject.cmake b/scripts/cmake/DependenciesExternalProject.cmake index 80e284447d4..3d1ab659b94 100644 --- a/scripts/cmake/DependenciesExternalProject.cmake +++ b/scripts/cmake/DependenciesExternalProject.cmake @@ -159,20 +159,14 @@ if(OGS_USE_PETSC) endif() unset(ENV{PETSC_DIR}) - # Remove after upgrading PETSc to > 3.18 - file( - DOWNLOAD - http://ftp.mcs.anl.gov/pub/petsc/externalpackages/f2cblaslapack-3.4.2.q4.tar.gz - ${CMAKE_CURRENT_BINARY_DIR}/f2cblaslapack-3.4.2.q4.tar.gz - ) BuildExternalProject( PETSc ${_petsc_source} LOG_OUTPUT_ON_FAILURE ON CONFIGURE_COMMAND ./configure - --download-f2cblaslapack=${CMAKE_CURRENT_BINARY_DIR}/f2cblaslapack-3.4.2.q4.tar.gz --prefix= - --download-hypre + --download-f2cblaslapack=1 + --download-hypre=1 --with-debugging=$ ${_configure_opts} ${OGS_PETSC_CONFIG_OPTIONS} diff --git a/web/data/versions.json b/web/data/versions.json index 83312219753..72a5cb8eefd 100644 --- a/web/data/versions.json +++ b/web/data/versions.json @@ -16,7 +16,7 @@ "eigen": "3.4.0", "eigen-unsupported": "9441d94dccccd5db8d64179516fdc5b53994a047", "vtk": "9.1.0", - "petsc": "3.16.1", + "petsc": "3.18.6", "qt": "5.14.2", "python": "3.6", "snakemake": "7.20.0", From e6da75cc4e96bd8e854afe325b87d268107a259c Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Fri, 22 Dec 2023 09:16:58 +0100 Subject: [PATCH 3/3] Updated ext cache version. --- web/data/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/data/versions.json b/web/data/versions.json index 72a5cb8eefd..c6c8c49fc1f 100644 --- a/web/data/versions.json +++ b/web/data/versions.json @@ -75,7 +75,7 @@ "package_file_sha256": "fe5b6489d66351dfac09622ac53d3fd987b2b7d81df01038ad0c2e316d6a3ebd" }, "ext": { - "cache_hash": "8621cb642359944025c34dc50eafc8ee8155c710" + "cache_hash": "5063f1593404ca5e61365e327a09cb3a1edcea1c" }, "libraries": { "vtk": {