diff --git a/ci/config.yaml b/ci/config.yaml index 2a6696b6..61149dae 100644 --- a/ci/config.yaml +++ b/ci/config.yaml @@ -27,7 +27,7 @@ defaults: pip-packages: &pip-packages "nanobind yaml setuptools" # default arguments for dependency installation scripts - cmake-args: &cmake-args '3.23.4' + cmake-args: &cmake-args '3.30.3' openmpi-args: &openmpi-args ['v5.0', '5.0.4'] zoltan-args: &zoltan-args [-j4', '/trilinos-install'] mpich-args: &mpich-args ['4.0.2', '-j4'] @@ -77,7 +77,7 @@ setup: GCOV: gcov # deps and versions to find in vt deps: - packages: [ *apt-packages, gcc-9, g++-9 ] + packages: [ *apt-packages, gcc-9, g++-9] cmake: *cmake-args openmpi: *openmpi-args zoltan: *zoltan-args diff --git a/ci/setup-template.sh b/ci/setup-template.sh index 96859c83..881a2960 100644 --- a/ci/setup-template.sh +++ b/ci/setup-template.sh @@ -93,28 +93,3 @@ then else echo "No cleanup instructions defined for OS=$OS." fi - -### OUTPUT COMPILER INFORMATION -if test -n "$CC" -then - echo "------------" - which $CC - echo "C Compiler:" - $(which $CC) --version -fi - -if test -n "$CXX" -then - echo "--------------------" - which $CXX - echo "C++ Compiler:" - $(which $CXX) --version -fi - -if test -n "$FC" -then - echo "------------------------" - which $FC - echo "Fortran Compiler:" - $(which $FC) --version -fi diff --git a/ci/shared/scripts/setup-amd64-alpine-clang-13-clang-13-cpp.sh b/ci/shared/scripts/setup-amd64-alpine-clang-13-clang-13-cpp.sh index ec5112bb..04a9feef 100644 --- a/ci/shared/scripts/setup-amd64-alpine-clang-13-clang-13-cpp.sh +++ b/ci/shared/scripts/setup-amd64-alpine-clang-13-clang-13-cpp.sh @@ -95,28 +95,3 @@ then else echo "No cleanup instructions defined for OS=$OS." fi - -### OUTPUT COMPILER INFORMATION -if test -n "$CC" -then - echo "------------" - which $CC - echo "C Compiler:" - $(which $CC) --version -fi - -if test -n "$CXX" -then - echo "--------------------" - which $CXX - echo "C++ Compiler:" - $(which $CXX) --version -fi - -if test -n "$FC" -then - echo "------------------------" - which $FC - echo "Fortran Compiler:" - $(which $FC) --version -fi diff --git a/ci/shared/scripts/setup-macos-14-clang-14.sh b/ci/shared/scripts/setup-macos-14-clang-14.sh index f475e28f..aa628b14 100644 --- a/ci/shared/scripts/setup-macos-14-clang-14.sh +++ b/ci/shared/scripts/setup-macos-14-clang-14.sh @@ -93,28 +93,3 @@ then else echo "No cleanup instructions defined for OS=$OS." fi - -### OUTPUT COMPILER INFORMATION -if test -n "$CC" -then - echo "------------" - which $CC - echo "C Compiler:" - $(which $CC) --version -fi - -if test -n "$CXX" -then - echo "--------------------" - which $CXX - echo "C++ Compiler:" - $(which $CXX) --version -fi - -if test -n "$FC" -then - echo "------------------------" - which $FC - echo "Fortran Compiler:" - $(which $FC) --version -fi diff --git a/ci/shared/scripts/setup-ubuntu-20.04-gcc-9-12.2.0-cpp.sh b/ci/shared/scripts/setup-ubuntu-20.04-gcc-9-12.2.0-cpp.sh index 4de0a868..b5f53fb8 100644 --- a/ci/shared/scripts/setup-ubuntu-20.04-gcc-9-12.2.0-cpp.sh +++ b/ci/shared/scripts/setup-ubuntu-20.04-gcc-9-12.2.0-cpp.sh @@ -77,7 +77,7 @@ wget $SCRIPTS_DEPS_URL/mpich.sh chmod u+x *.sh ls -l ./packages.sh "curl" "jq" "less" "libomp5" "libunwind-dev make-guile" "ninja-build" "valgrind" "zlib1g" "zlib1g-dev" "ccache" "python3" "gcc-9" "g++-9" -./cmake.sh "3.23.4" +./cmake.sh "3.30.3" ./openmpi.sh "v5.0" "5.0.4" ./zoltan.sh "-j4'" "/trilinos-install" ./mpich.sh "4.0.2" "-j4" @@ -101,28 +101,3 @@ then else echo "No cleanup instructions defined for OS=$OS." fi - -### OUTPUT COMPILER INFORMATION -if test -n "$CC" -then - echo "------------" - which $CC - echo "C Compiler:" - $(which $CC) --version -fi - -if test -n "$CXX" -then - echo "--------------------" - which $CXX - echo "C++ Compiler:" - $(which $CXX) --version -fi - -if test -n "$FC" -then - echo "------------------------" - which $FC - echo "Fortran Compiler:" - $(which $FC) --version -fi diff --git a/ci/shared/scripts/setup-ubuntu-22.04-clang-11-vtk-9.2.2-py-3.all.sh b/ci/shared/scripts/setup-ubuntu-22.04-clang-11-vtk-9.2.2-py-3.all.sh index 49245899..c0ef2a59 100644 --- a/ci/shared/scripts/setup-ubuntu-22.04-clang-11-vtk-9.2.2-py-3.all.sh +++ b/ci/shared/scripts/setup-ubuntu-22.04-clang-11-vtk-9.2.2-py-3.all.sh @@ -85,7 +85,7 @@ ls -l ./conda-python-env.sh "3.10" "nanobind yaml setuptools" ./conda-python-env.sh "3.11" "nanobind yaml setuptools" ./conda-python-env.sh "3.12" "nanobind yaml setuptools" -./cmake.sh "3.23.4" +./cmake.sh "3.30.3" ./vtk.sh "9.2.2" # Remove install scripts @@ -107,28 +107,3 @@ then else echo "No cleanup instructions defined for OS=$OS." fi - -### OUTPUT COMPILER INFORMATION -if test -n "$CC" -then - echo "------------" - which $CC - echo "C Compiler:" - $(which $CC) --version -fi - -if test -n "$CXX" -then - echo "--------------------" - which $CXX - echo "C++ Compiler:" - $(which $CXX) --version -fi - -if test -n "$FC" -then - echo "------------------------" - which $FC - echo "Fortran Compiler:" - $(which $FC) --version -fi diff --git a/ci/shared/scripts/setup-ubuntu-22.04-gcc-11-vtk-9.2.2-py-3.all.sh b/ci/shared/scripts/setup-ubuntu-22.04-gcc-11-vtk-9.2.2-py-3.all.sh index 4ce07d1a..99da5f0f 100644 --- a/ci/shared/scripts/setup-ubuntu-22.04-gcc-11-vtk-9.2.2-py-3.all.sh +++ b/ci/shared/scripts/setup-ubuntu-22.04-gcc-11-vtk-9.2.2-py-3.all.sh @@ -85,7 +85,7 @@ ls -l ./conda-python-env.sh "3.10" "nanobind yaml setuptools" ./conda-python-env.sh "3.11" "nanobind yaml setuptools" ./conda-python-env.sh "3.12" "nanobind yaml setuptools" -./cmake.sh "3.23.4" +./cmake.sh "3.30.3" ./vtk.sh "9.2.2" # Remove install scripts @@ -107,28 +107,3 @@ then else echo "No cleanup instructions defined for OS=$OS." fi - -### OUTPUT COMPILER INFORMATION -if test -n "$CC" -then - echo "------------" - which $CC - echo "C Compiler:" - $(which $CC) --version -fi - -if test -n "$CXX" -then - echo "--------------------" - which $CXX - echo "C++ Compiler:" - $(which $CXX) --version -fi - -if test -n "$FC" -then - echo "------------------------" - which $FC - echo "Fortran Compiler:" - $(which $FC) --version -fi diff --git a/ci/shared/scripts/setup-ubuntu-22.04-gcc-12-vtk-9.3.0-py-3.all.sh b/ci/shared/scripts/setup-ubuntu-22.04-gcc-12-vtk-9.3.0-py-3.all.sh index a9f60211..c7bc79d8 100644 --- a/ci/shared/scripts/setup-ubuntu-22.04-gcc-12-vtk-9.3.0-py-3.all.sh +++ b/ci/shared/scripts/setup-ubuntu-22.04-gcc-12-vtk-9.3.0-py-3.all.sh @@ -85,7 +85,7 @@ ls -l ./conda-python-env.sh "3.10" "nanobind yaml setuptools" ./conda-python-env.sh "3.11" "nanobind yaml setuptools" ./conda-python-env.sh "3.12" "nanobind yaml setuptools" -./cmake.sh "3.23.4" +./cmake.sh "3.30.3" ./vtk.sh "9.3.0" # Remove install scripts @@ -107,28 +107,3 @@ then else echo "No cleanup instructions defined for OS=$OS." fi - -### OUTPUT COMPILER INFORMATION -if test -n "$CC" -then - echo "------------" - which $CC - echo "C Compiler:" - $(which $CC) --version -fi - -if test -n "$CXX" -then - echo "--------------------" - which $CXX - echo "C++ Compiler:" - $(which $CXX) --version -fi - -if test -n "$FC" -then - echo "------------------------" - which $FC - echo "Fortran Compiler:" - $(which $FC) --version -fi diff --git a/ci/shared/scripts/setup-ubuntu-24.04-gcc-13-vtk-9.3.1-py-3.all.sh b/ci/shared/scripts/setup-ubuntu-24.04-gcc-13-vtk-9.3.1-py-3.all.sh index 11f7eb5b..2f3acab8 100644 --- a/ci/shared/scripts/setup-ubuntu-24.04-gcc-13-vtk-9.3.1-py-3.all.sh +++ b/ci/shared/scripts/setup-ubuntu-24.04-gcc-13-vtk-9.3.1-py-3.all.sh @@ -85,7 +85,7 @@ ls -l ./conda-python-env.sh "3.10" "nanobind yaml setuptools" ./conda-python-env.sh "3.11" "nanobind yaml setuptools" ./conda-python-env.sh "3.12" "nanobind yaml setuptools" -./cmake.sh "3.23.4" +./cmake.sh "3.30.3" ./vtk.sh "9.3.1" # Remove install scripts @@ -107,28 +107,3 @@ then else echo "No cleanup instructions defined for OS=$OS." fi - -### OUTPUT COMPILER INFORMATION -if test -n "$CC" -then - echo "------------" - which $CC - echo "C Compiler:" - $(which $CC) --version -fi - -if test -n "$CXX" -then - echo "--------------------" - which $CXX - echo "C++ Compiler:" - $(which $CXX) --version -fi - -if test -n "$FC" -then - echo "------------------------" - which $FC - echo "Fortran Compiler:" - $(which $FC) --version -fi