Skip to content

Commit 95bbe00

Browse files
authored
Update Dependencies (GridTools#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
1 parent 072a782 commit 95bbe00

File tree

6 files changed

+25
-24
lines changed

6 files changed

+25
-24
lines changed

CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ if(NOT _gridtools_already_fetched)
4848
endif()
4949
if(NOT GridTools_FOUND)
5050
set(_gridtools_repository "https://github.com/GridTools/gridtools.git")
51-
set(_gridtools_tag "release_v2.2")
51+
set(_gridtools_tag "release_v2.3")
5252
if(NOT _gridtools_already_fetched)
5353
message(STATUS "Fetching GridTools ${_gridtools_tag} from ${_gridtools_repository}")
5454
endif()
@@ -57,6 +57,7 @@ if(NOT GridTools_FOUND)
5757
gridtools
5858
GIT_REPOSITORY ${_gridtools_repository}
5959
GIT_TAG ${_gridtools_tag}
60+
OVERRIDE_FIND_PACKAGE
6061
)
6162
FetchContent_MakeAvailable(gridtools)
6263
set(_gridtools_already_fetched ON CACHE INTERNAL "")

Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ RUN apt-get update -qq && \
1414
libnuma-dev && \
1515
rm -rf /var/lib/apt/lists/*
1616

17-
ARG CMAKE_VERSION=3.18.4
18-
RUN wget -q https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz && \
19-
tar xzf cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz && \
20-
cp -r cmake-${CMAKE_VERSION}-Linux-x86_64/bin cmake-${CMAKE_VERSION}-Linux-x86_64/share /usr/local/ && \
21-
rm -rf cmake-${CMAKE_VERSION}-Linux-x86_64*
17+
ARG CMAKE_VERSION=3.28.3
18+
RUN wget -q https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz && \
19+
tar xzf cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz && \
20+
cp -r cmake-${CMAKE_VERSION}-linux-x86_64/bin cmake-${CMAKE_VERSION}-linux-x86_64/share /usr/local/ && \
21+
rm -rf cmake-${CMAKE_VERSION}-linux-x86_64*
2222

2323
ARG BOOST_VERSION=1.67.0
2424
RUN export BOOST_VERSION_UNDERLINE=$(echo ${BOOST_VERSION} | sed 's/\./_/g') && \

python/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include(FetchContent)
66
FetchContent_Declare(
77
pybind11
88
GIT_REPOSITORY "https://github.com/pybind/pybind11.git"
9-
GIT_TAG "v2.6"
9+
GIT_TAG "v2.11"
1010
)
1111
FetchContent_MakeAvailable(pybind11)
1212

src/numerics/advection.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,9 @@ horizontal(vec<std::size_t, 3> const &resolution, vec<real_t, 3> const &delta) {
238238
storage_t v, real_t dt) {
239239
gt::stencil::run_single_stage(
240240
stage_horizontal(), backend_t<GTBENCH_BPARAMS_HADV>(), grid, out, in,
241-
in0, u, v, gt::stencil::make_global_parameter(delta.x),
242-
gt::stencil::make_global_parameter(delta.y),
243-
gt::stencil::make_global_parameter(dt));
241+
in0, u, v, gt::stencil::global_parameter{delta.x},
242+
gt::stencil::global_parameter{delta.y},
243+
gt::stencil::global_parameter{dt});
244244
};
245245
}
246246

@@ -275,9 +275,9 @@ vertical(vec<std::size_t, 3> const &resolution, vec<real_t, 3> const &delta) {
275275
real_t dt) {
276276
gt::stencil::run(spec, backend_t<GTBENCH_BPARAMS_VADV>(), grid, out, in, in,
277277
in0, w, d1, d2,
278-
gt::stencil::make_global_parameter(resolution.z),
279-
gt::stencil::make_global_parameter(delta.z),
280-
gt::stencil::make_global_parameter(dt));
278+
gt::stencil::global_parameter{resolution.z},
279+
gt::stencil::global_parameter{delta.z},
280+
gt::stencil::global_parameter{dt});
281281
};
282282
}
283283

src/numerics/diffusion.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,12 @@ horizontal(vec<std::size_t, 3> const &resolution, vec<real_t, 3> const &delta,
220220
auto grid = computation_grid(resolution.x, resolution.y, resolution.z);
221221
return [grid = std::move(grid), delta, coeff](storage_t out, storage_t in,
222222
real_t dt) {
223-
gt::stencil::run_single_stage(
224-
stage_horizontal(), backend_t<GTBENCH_BPARAMS_HDIFF>(), grid, out, in,
225-
gt::stencil::make_global_parameter(delta.x),
226-
gt::stencil::make_global_parameter(delta.y),
227-
gt::stencil::make_global_parameter(dt),
228-
gt::stencil::make_global_parameter(coeff));
223+
gt::stencil::run_single_stage(stage_horizontal(),
224+
backend_t<GTBENCH_BPARAMS_HDIFF>(), grid, out,
225+
in, gt::stencil::global_parameter{delta.x},
226+
gt::stencil::global_parameter{delta.y},
227+
gt::stencil::global_parameter{dt},
228+
gt::stencil::global_parameter{coeff});
229229
};
230230
}
231231

@@ -258,10 +258,10 @@ vertical(vec<std::size_t, 3> const &resolution, vec<real_t, 3> const &delta,
258258
delta, resolution, coeff](storage_t out, storage_t in, real_t dt) {
259259
gt::stencil::run(spec, backend_t<GTBENCH_BPARAMS_VDIFF>(), grid, out, in,
260260
in, out /* out is used as temporary storage d1 */, d2,
261-
gt::stencil::make_global_parameter(resolution.z),
262-
gt::stencil::make_global_parameter(delta.z),
263-
gt::stencil::make_global_parameter(dt),
264-
gt::stencil::make_global_parameter(coeff));
261+
gt::stencil::global_parameter{resolution.z},
262+
gt::stencil::global_parameter{delta.z},
263+
gt::stencil::global_parameter{dt},
264+
gt::stencil::global_parameter{coeff});
265265
};
266266
}
267267

src/runtime/ghex_comm/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if(NOT _ghex_already_fetched)
66
endif()
77
if(NOT GHEX_FOUND)
88
set(_ghex_repository "https://github.com/ghex-org/GHEX.git")
9-
set(_ghex_tag "747cbca378ae7cac0e80fe9d02c382c234d9ab44")
9+
set(_ghex_tag "v0.4.0")
1010
if(NOT _ghex_already_fetched)
1111
message(STATUS "Fetching GHEX ${_ghex_tag} from ${_ghex_repository}")
1212
endif()

0 commit comments

Comments
 (0)