From 82597d867732214a0d3140b591ea34f4432a1cd1 Mon Sep 17 00:00:00 2001 From: Ahmad El Sayed Date: Tue, 21 May 2024 15:51:52 +0200 Subject: [PATCH 1/8] Bumped versions of all modules - GCC 12 --- .github/workflows/build-and-test-workflow.yml | 6 +++--- scripts/module_load.sh | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-and-test-workflow.yml b/.github/workflows/build-and-test-workflow.yml index 9c1c61813..a1ab51f7e 100644 --- a/.github/workflows/build-and-test-workflow.yml +++ b/.github/workflows/build-and-test-workflow.yml @@ -19,12 +19,12 @@ jobs: name: ${{ inputs.platform }}-${{ inputs.build_type }} - # The default compiler on macos is clang, switch to gcc 11. Specifying the version is necessary. + # The default compiler on macos is clang, switch to gcc. Specifying the version is necessary. # It seems like gcc and g++ are symbolic links to the default clang and clang++ compilers, respectively. # CMAKE_CXX_COMPILER_ID will evaluate to AppleClang rather than GNU on macos. env: - CC: gcc-11 - CXX: g++-11 + CC: gcc-12 + CXX: g++-12 # Build steps steps: diff --git a/scripts/module_load.sh b/scripts/module_load.sh index 5931261d3..bf8da2c8c 100644 --- a/scripts/module_load.sh +++ b/scripts/module_load.sh @@ -1,7 +1,7 @@ # Script that is meant to be sourced in the CI # It includes the necessary module loads to build MeshKernel on Deltares Linux machines -module load cmake/3.23.1_gcc11.3.0 -module load gcc/11.3.0 -module load boost/1.81.0_gcc11.3.0 -module load netcdf/v4.9.1_gcc11.3.0 +module load gcc/12.2.0_gcc12.2.0 +module load cmake/3.26.4_gcc12.2.0 +module load boost/1.83.0_gcc12.2.0 +module load netcdf/4.9.2_4.6.1_gcc12.2.0 From 766486333f4687d6a577a2de6cfbba60b7c3dd74 Mon Sep 17 00:00:00 2001 From: Ahmad El Sayed Date: Wed, 22 May 2024 11:00:57 +0200 Subject: [PATCH 2/8] Make module loading verbose and print debug info --- scripts/module_load.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/module_load.sh b/scripts/module_load.sh index bf8da2c8c..14a336f57 100644 --- a/scripts/module_load.sh +++ b/scripts/module_load.sh @@ -1,7 +1,7 @@ # Script that is meant to be sourced in the CI # It includes the necessary module loads to build MeshKernel on Deltares Linux machines -module load gcc/12.2.0_gcc12.2.0 -module load cmake/3.26.4_gcc12.2.0 -module load boost/1.83.0_gcc12.2.0 -module load netcdf/4.9.2_4.6.1_gcc12.2.0 +module -DD -vv load gcc/12.2.0_gcc12.2.0 +module -DD -vv load cmake/3.26.4_gcc12.2.0 +module -DD -vv load boost/1.83.0_gcc12.2.0 +module -DD -vv load netcdf/4.9.2_4.6.1_gcc12.2.0 From 7fbc4d7b69400d50fed225552f77ca9d330fd00c Mon Sep 17 00:00:00 2001 From: Ahmad El Sayed Date: Wed, 22 May 2024 11:06:27 +0200 Subject: [PATCH 3/8] Use --verbose and --debug switches --- scripts/module_load.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/module_load.sh b/scripts/module_load.sh index 14a336f57..94d016bf5 100644 --- a/scripts/module_load.sh +++ b/scripts/module_load.sh @@ -1,7 +1,7 @@ # Script that is meant to be sourced in the CI # It includes the necessary module loads to build MeshKernel on Deltares Linux machines -module -DD -vv load gcc/12.2.0_gcc12.2.0 -module -DD -vv load cmake/3.26.4_gcc12.2.0 -module -DD -vv load boost/1.83.0_gcc12.2.0 -module -DD -vv load netcdf/4.9.2_4.6.1_gcc12.2.0 +module --debug --verbose load gcc/12.2.0_gcc12.2.0 +module --debug --verbose load cmake/3.26.4_gcc12.2.0 +module --debug --verbose load boost/1.83.0_gcc12.2.0 +module --debug --verbose load netcdf/4.9.2_4.6.1_gcc12.2.0 From 42dae79d31ae936219a930e70902a057a1094545 Mon Sep 17 00:00:00 2001 From: Ahmad El Sayed Date: Thu, 23 May 2024 10:36:23 +0200 Subject: [PATCH 4/8] Use newly installed netCDF v4.9.2 that actually has CMake support --- scripts/module_load.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/module_load.sh b/scripts/module_load.sh index 94d016bf5..68710abb5 100644 --- a/scripts/module_load.sh +++ b/scripts/module_load.sh @@ -1,7 +1,7 @@ # Script that is meant to be sourced in the CI # It includes the necessary module loads to build MeshKernel on Deltares Linux machines -module --debug --verbose load gcc/12.2.0_gcc12.2.0 -module --debug --verbose load cmake/3.26.4_gcc12.2.0 -module --debug --verbose load boost/1.83.0_gcc12.2.0 -module --debug --verbose load netcdf/4.9.2_4.6.1_gcc12.2.0 +module --verbose load gcc/12.2.0_gcc12.2.0 +module --verbose load cmake/3.26.4_gcc12.2.0 +module --verbose load boost/1.83.0_gcc12.2.0 +module --verbose load netcdf/4.9.2_gcc12.2.0 From 68e00e3ac1db51f58e979d9c5a3aafac54908459 Mon Sep 17 00:00:00 2001 From: Ahmad El Sayed Date: Thu, 23 May 2024 10:57:48 +0200 Subject: [PATCH 5/8] Fix gcc-12 warnings that are treated as errors --- libs/MeshKernel/src/Operations.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/MeshKernel/src/Operations.cpp b/libs/MeshKernel/src/Operations.cpp index 115ac9a64..05dabd740 100644 --- a/libs/MeshKernel/src/Operations.cpp +++ b/libs/MeshKernel/src/Operations.cpp @@ -62,7 +62,7 @@ namespace meshkernel } bool inRange = false; - UInt startRange; + UInt startRange = 0; for (auto n = start; n < end; n++) { if (!IsEqual(vec[n].x, separator) && !inRange) From 63d44bc2599433c76e56a3555130e0419f439980 Mon Sep 17 00:00:00 2001 From: Ahmad El Sayed Date: Thu, 23 May 2024 11:08:38 +0200 Subject: [PATCH 6/8] Added curl module --- scripts/module_load.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/module_load.sh b/scripts/module_load.sh index 68710abb5..67fbd4a59 100644 --- a/scripts/module_load.sh +++ b/scripts/module_load.sh @@ -5,3 +5,4 @@ module --verbose load gcc/12.2.0_gcc12.2.0 module --verbose load cmake/3.26.4_gcc12.2.0 module --verbose load boost/1.83.0_gcc12.2.0 module --verbose load netcdf/4.9.2_gcc12.2.0 +module --verbose load curl/8.6.0 From c811fddc500ad2dca6b87b83f252aa9baa1de1ba Mon Sep 17 00:00:00 2001 From: Ahmad El Sayed Date: Thu, 23 May 2024 11:11:38 +0200 Subject: [PATCH 7/8] Revert "Added curl module" This reverts commit 63d44bc2599433c76e56a3555130e0419f439980. --- scripts/module_load.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/module_load.sh b/scripts/module_load.sh index 67fbd4a59..68710abb5 100644 --- a/scripts/module_load.sh +++ b/scripts/module_load.sh @@ -5,4 +5,3 @@ module --verbose load gcc/12.2.0_gcc12.2.0 module --verbose load cmake/3.26.4_gcc12.2.0 module --verbose load boost/1.83.0_gcc12.2.0 module --verbose load netcdf/4.9.2_gcc12.2.0 -module --verbose load curl/8.6.0 From dc0f78837f0c0d9e4f35cd0fc2efd4c61f41c8a8 Mon Sep 17 00:00:00 2001 From: Ahmad El Sayed Date: Thu, 23 May 2024 14:11:13 +0200 Subject: [PATCH 8/8] Try loading module curl/8.8.0_gcc12.2.0 --- scripts/module_load.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/module_load.sh b/scripts/module_load.sh index 68710abb5..2cf5bb3fc 100644 --- a/scripts/module_load.sh +++ b/scripts/module_load.sh @@ -5,3 +5,4 @@ module --verbose load gcc/12.2.0_gcc12.2.0 module --verbose load cmake/3.26.4_gcc12.2.0 module --verbose load boost/1.83.0_gcc12.2.0 module --verbose load netcdf/4.9.2_gcc12.2.0 +module --verbose load curl/8.8.0_gcc12.2.0