Merge remote-tracking branch 'upstream/master' into data-store-ldg

GridTools · Jul 24, 2024 · 336ede4 · 336ede4
2 parents 5a1c7b5 + b6e3dce
commit 336ede4
Show file tree

Hide file tree

Showing 8 changed files with 86,815 additions and 86,812 deletions.
diff --git a/pyutils/perftest/references/daint_cray/128.json b/pyutils/perftest/references/daint_cray/128.json
diff --git a/pyutils/perftest/references/daint_cray/256.json b/pyutils/perftest/references/daint_cray/256.json
diff --git a/pyutils/perftest/references/daint_nvcc_cray/128.json b/pyutils/perftest/references/daint_nvcc_cray/128.json
diff --git a/pyutils/perftest/references/daint_nvcc_cray/256.json b/pyutils/perftest/references/daint_nvcc_cray/256.json
diff --git a/pyutils/perftest/references/daint_nvcc_gcc/128.json b/pyutils/perftest/references/daint_nvcc_gcc/128.json
diff --git a/pyutils/perftest/references/daint_nvcc_gcc/256.json b/pyutils/perftest/references/daint_nvcc_gcc/256.json
diff --git a/tests/include/fn_mesh.hpp b/tests/include/fn_mesh.hpp
@@ -75,6 +75,7 @@ namespace gridtools {
       public:
         using max_v2e_neighbors_t = std::integral_constant<int, 6>;
         using max_e2v_neighbors_t = std::integral_constant<int, 2>;
+        using float_t = FloatType;
 
         constexpr structured_unstructured_mesh(int nx, int ny, int nz) : m_nx(nx), m_ny(ny), m_nz(nz) {}
 

diff --git a/tests/regression/fn/fn_unstructured_nabla.cpp b/tests/regression/fn/fn_unstructured_nabla.cpp
@@ -186,6 +186,7 @@ namespace {
 
     constexpr inline auto make_comp = [](auto backend, auto const &mesh, auto &nabla) {
         using mesh_t = std::remove_reference_t<decltype(mesh)>;
+        using float_t = typename mesh_t::float_t;
         return [backend,
                    &nabla,
                    nvertices = mesh.nvertices(),
@@ -209,6 +210,7 @@ namespace {
 
     constexpr inline auto make_comp_fused = [](auto backend, auto const &mesh, auto &nabla) {
         using mesh_t = std::remove_reference_t<decltype(mesh)>;
+        using float_t = typename mesh_t::float_t;
         return [backend,
                    &nabla,
                    nvertices = mesh.nvertices(),