Update Dependencies (#83)

- Update `gridtools` to the latest release (`release_v2.3`) - Update `GHEX` to the latest release ('v0.4.0') - Update `pybind11` to the latest release (`v2.11.1`) - Update `CMake` in `python` GitHub Action to latest version (`3.28.3`) - Fixed warnings
GridTools · Jul 22, 2024 · 95bbe00 · 95bbe00
1 parent 072a782
commit 95bbe00
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 24 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -48,7 +48,7 @@ if(NOT _gridtools_already_fetched)
 endif()
 if(NOT GridTools_FOUND)
   set(_gridtools_repository "https://github.com/GridTools/gridtools.git")
-  set(_gridtools_tag        "release_v2.2")
+  set(_gridtools_tag        "release_v2.3")
   if(NOT _gridtools_already_fetched)
     message(STATUS "Fetching GridTools ${_gridtools_tag} from ${_gridtools_repository}")
   endif()
@@ -57,6 +57,7 @@ if(NOT GridTools_FOUND)
     gridtools
     GIT_REPOSITORY ${_gridtools_repository}
     GIT_TAG        ${_gridtools_tag}
+    OVERRIDE_FIND_PACKAGE
   )
   FetchContent_MakeAvailable(gridtools)
   set(_gridtools_already_fetched ON CACHE INTERNAL "")

diff --git a/Dockerfile b/Dockerfile
@@ -14,11 +14,11 @@ RUN apt-get update -qq && \
     libnuma-dev && \
     rm -rf /var/lib/apt/lists/*
 
-ARG CMAKE_VERSION=3.18.4
-RUN wget -q https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz && \
-    tar xzf cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz && \
-    cp -r cmake-${CMAKE_VERSION}-Linux-x86_64/bin cmake-${CMAKE_VERSION}-Linux-x86_64/share /usr/local/ && \
-    rm -rf cmake-${CMAKE_VERSION}-Linux-x86_64*
+ARG CMAKE_VERSION=3.28.3
+RUN wget -q https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz && \
+    tar xzf cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz && \
+    cp -r cmake-${CMAKE_VERSION}-linux-x86_64/bin cmake-${CMAKE_VERSION}-linux-x86_64/share /usr/local/ && \
+    rm -rf cmake-${CMAKE_VERSION}-linux-x86_64*
 
 ARG BOOST_VERSION=1.67.0
 RUN export BOOST_VERSION_UNDERLINE=$(echo ${BOOST_VERSION} | sed 's/\./_/g') && \

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -6,7 +6,7 @@ include(FetchContent)
 FetchContent_Declare(
   pybind11
   GIT_REPOSITORY "https://github.com/pybind/pybind11.git"
-  GIT_TAG        "v2.6"
+  GIT_TAG        "v2.11"
 )
 FetchContent_MakeAvailable(pybind11)
 

diff --git a/src/numerics/advection.cpp b/src/numerics/advection.cpp
@@ -238,9 +238,9 @@ horizontal(vec<std::size_t, 3> const &resolution, vec<real_t, 3> const &delta) {
                                          storage_t v, real_t dt) {
     gt::stencil::run_single_stage(
         stage_horizontal(), backend_t<GTBENCH_BPARAMS_HADV>(), grid, out, in,
-        in0, u, v, gt::stencil::make_global_parameter(delta.x),
-        gt::stencil::make_global_parameter(delta.y),
-        gt::stencil::make_global_parameter(dt));
+        in0, u, v, gt::stencil::global_parameter{delta.x},
+        gt::stencil::global_parameter{delta.y},
+        gt::stencil::global_parameter{dt});
   };
 }
 
@@ -275,9 +275,9 @@ vertical(vec<std::size_t, 3> const &resolution, vec<real_t, 3> const &delta) {
                       real_t dt) {
     gt::stencil::run(spec, backend_t<GTBENCH_BPARAMS_VADV>(), grid, out, in, in,
                      in0, w, d1, d2,
-                     gt::stencil::make_global_parameter(resolution.z),
-                     gt::stencil::make_global_parameter(delta.z),
-                     gt::stencil::make_global_parameter(dt));
+                     gt::stencil::global_parameter{resolution.z},
+                     gt::stencil::global_parameter{delta.z},
+                     gt::stencil::global_parameter{dt});
   };
 }
 

diff --git a/src/numerics/diffusion.cpp b/src/numerics/diffusion.cpp
@@ -220,12 +220,12 @@ horizontal(vec<std::size_t, 3> const &resolution, vec<real_t, 3> const &delta,
   auto grid = computation_grid(resolution.x, resolution.y, resolution.z);
   return [grid = std::move(grid), delta, coeff](storage_t out, storage_t in,
                                                 real_t dt) {
-    gt::stencil::run_single_stage(
-        stage_horizontal(), backend_t<GTBENCH_BPARAMS_HDIFF>(), grid, out, in,
-        gt::stencil::make_global_parameter(delta.x),
-        gt::stencil::make_global_parameter(delta.y),
-        gt::stencil::make_global_parameter(dt),
-        gt::stencil::make_global_parameter(coeff));
+    gt::stencil::run_single_stage(stage_horizontal(),
+                                  backend_t<GTBENCH_BPARAMS_HDIFF>(), grid, out,
+                                  in, gt::stencil::global_parameter{delta.x},
+                                  gt::stencil::global_parameter{delta.y},
+                                  gt::stencil::global_parameter{dt},
+                                  gt::stencil::global_parameter{coeff});
   };
 }
 
@@ -258,10 +258,10 @@ vertical(vec<std::size_t, 3> const &resolution, vec<real_t, 3> const &delta,
           delta, resolution, coeff](storage_t out, storage_t in, real_t dt) {
     gt::stencil::run(spec, backend_t<GTBENCH_BPARAMS_VDIFF>(), grid, out, in,
                      in, out /* out is used as temporary storage d1 */, d2,
-                     gt::stencil::make_global_parameter(resolution.z),
-                     gt::stencil::make_global_parameter(delta.z),
-                     gt::stencil::make_global_parameter(dt),
-                     gt::stencil::make_global_parameter(coeff));
+                     gt::stencil::global_parameter{resolution.z},
+                     gt::stencil::global_parameter{delta.z},
+                     gt::stencil::global_parameter{dt},
+                     gt::stencil::global_parameter{coeff});
   };
 }
 

diff --git a/src/runtime/ghex_comm/CMakeLists.txt b/src/runtime/ghex_comm/CMakeLists.txt
@@ -6,7 +6,7 @@ if(NOT _ghex_already_fetched)
 endif()
 if(NOT GHEX_FOUND)
   set(_ghex_repository "https://github.com/ghex-org/GHEX.git")
-  set(_ghex_tag        "747cbca378ae7cac0e80fe9d02c382c234d9ab44")
+  set(_ghex_tag        "v0.4.0")
   if(NOT _ghex_already_fetched)
     message(STATUS "Fetching GHEX ${_ghex_tag} from ${_ghex_repository}")
   endif()