Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #83

Merged
merged 28 commits into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
2776783
Update gridtools
iomaganaris Feb 12, 2024
4c286cb
Fix warnings with deprecated API
iomaganaris Feb 12, 2024
e683db6
Use updated ghex
iomaganaris Feb 13, 2024
430a8a9
Make clang-format happy
iomaganaris Feb 14, 2024
3edacde
Make clang-format happier
iomaganaris Feb 14, 2024
323919b
Use commit from latest master of ghex
iomaganaris Feb 16, 2024
0f0cc4e
Fix gridtools not found by ghex
iomaganaris Feb 16, 2024
fb70bab
Avoid using cache in docker
iomaganaris Feb 26, 2024
b5e7390
Update pybind11
iomaganaris Feb 26, 2024
83f277b
Update cmake
iomaganaris Feb 26, 2024
5d993a4
Fix cmake url
iomaganaris Feb 26, 2024
f613cee
Fix cmake installation
iomaganaris Feb 26, 2024
38740e8
Fix cmake url
iomaganaris Feb 26, 2024
774f17c
Revert "Avoid using cache in docker"
iomaganaris Feb 26, 2024
b113e9e
Added script to build all the different variations for GH200
iomaganaris Feb 26, 2024
a76896f
Uncomment cmake build
iomaganaris Feb 26, 2024
615fbac
Fix indentation
iomaganaris Feb 26, 2024
8d77bc1
Add XPMEM and LIBFABRIC directories in the beginning of the script
iomaganaris Feb 27, 2024
3a9e153
Fix GPU compilation
iomaganaris Feb 27, 2024
df16b2c
Fix boost and ucx finding
iomaganaris Feb 27, 2024
87c2919
Initial plot scripts
iomaganaris Feb 28, 2024
3193a35
Fix element per second graph
iomaganaris Feb 28, 2024
f34e633
Use x axis values as xticks
iomaganaris Feb 28, 2024
b2e5dc9
Apply suggestions from code review
iomaganaris Jun 10, 2024
5ab91fc
Merge remote-tracking branch 'origin/ioannmag/update_gridtools' into …
iomaganaris Jun 10, 2024
38ee20e
Remove GH200 build script
iomaganaris Jun 10, 2024
5c3b9a6
Update GHEX version to v0.4.0
iomaganaris Jun 10, 2024
8df5162
Remove plotting utilities
iomaganaris Jun 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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 "")
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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') && \
Expand Down
2 changes: 1 addition & 1 deletion python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
12 changes: 6 additions & 6 deletions src/numerics/advection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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});
};
}

Expand Down Expand Up @@ -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});
};
}

Expand Down
20 changes: 10 additions & 10 deletions src/numerics/diffusion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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});
};
}

Expand Down Expand Up @@ -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});
};
}

Expand Down
2 changes: 1 addition & 1 deletion src/runtime/ghex_comm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Loading